From f42e986051409d585734f829f500bf13087adb9f Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Sat, 30 May 2020 19:14:49 +0000
Subject: [PATCH] Update tracker geometry from May 2020 CAD model
---
Control/CalypsoCommon/python/GlobalFlags.py | 2 +-
.../python/AllConfigFlags.py | 3 ++-
.../GeoModelTest/python/GeoModelTestConfig.py | 2 +-
.../python/RDOReadExampleConfig.py | 2 +-
.../python/WriteAlignmentConfig.py | 2 +-
.../GeoModel/FaserGeoModel/data/geomDB.sql | 19 ++++++++++++---
.../FaserGeoModel/python/DipoleGMConfig.py | 2 +-
.../FaserGeoModel/python/GeoModelConfig.py | 3 +--
.../FaserGeoModel/python/SCTGMConfig.py | 2 +-
.../FaserGeoModel/python/ScintGMConfig.py | 2 +-
.../test/FaserGeometryConfig_EVNT_test.py | 3 +--
.../share/translateBFieldMap.C | 16 ++++++++++---
Simulation/G4Faser/G4FaserAlg/test/runG4.py | 4 +---
.../src/FaserSCT_DetectorTool.cxx | 8 +++----
.../FaserSCT_GeoModel/src/SCT_Barrel.cxx | 20 +++++++++-------
.../{FaserSCT_GeoModel => src}/SCT_Barrel.h | 4 +++-
.../src/SCT_BarrelModuleParameters.cxx | 6 ++---
.../SCT_BarrelModuleParameters.h | 0
.../src/SCT_BarrelParameters.cxx | 6 ++---
.../SCT_BarrelParameters.h | 0
.../FaserSCT_GeoModel/src/SCT_BaseBoard.cxx | 10 ++++----
.../SCT_BaseBoard.h | 2 +-
.../src/SCT_ComponentFactory.cxx | 2 +-
.../SCT_ComponentFactory.h | 2 +-
.../FaserSCT_GeoModel/src/SCT_DataBase.cxx | 2 +-
.../{FaserSCT_GeoModel => src}/SCT_DataBase.h | 0
.../src/SCT_DetectorFactory.cxx | 15 ++++++------
.../SCT_DetectorFactory.h | 0
.../src/SCT_GeneralParameters.cxx | 4 ++--
.../SCT_GeneralParameters.h | 0
.../src/SCT_GeometryManager.cxx | 10 ++++----
.../SCT_GeometryManager.h | 2 +-
.../FaserSCT_GeoModel/src/SCT_HalfPlane.cxx | 14 +++++------
.../SCT_HalfPlane.h | 2 +-
.../FaserSCT_GeoModel/src/SCT_Hybrid.cxx | 8 +++----
.../{FaserSCT_GeoModel => src}/SCT_Hybrid.h | 2 +-
.../FaserSCT_GeoModel/src/SCT_Identifier.cxx | 2 +-
.../SCT_Identifier.h | 0
.../FaserSCT_GeoModel/src/SCT_InnerSide.cxx | 16 ++++++-------
.../SCT_InnerSide.h | 2 +-
.../src/SCT_MaterialManager.cxx | 4 ++--
.../SCT_MaterialManager.h | 0
.../FaserSCT_GeoModel/src/SCT_Module.cxx | 24 +++++++++----------
.../{FaserSCT_GeoModel => src}/SCT_Module.h | 2 +-
.../FaserSCT_GeoModel/src/SCT_Options.cxx | 2 +-
.../{FaserSCT_GeoModel => src}/SCT_Options.h | 0
.../FaserSCT_GeoModel/src/SCT_OuterSide.cxx | 18 +++++++-------
.../SCT_OuterSide.h | 2 +-
.../FaserSCT_GeoModel/src/SCT_Pigtail.cxx | 8 +++----
.../{FaserSCT_GeoModel => src}/SCT_Pigtail.h | 2 +-
.../FaserSCT_GeoModel/src/SCT_Plane.cxx | 16 ++++++-------
.../{FaserSCT_GeoModel => src}/SCT_Plane.h | 2 +-
.../FaserSCT_GeoModel/src/SCT_Sensor.cxx | 8 +++----
.../{FaserSCT_GeoModel => src}/SCT_Sensor.h | 2 +-
.../test/FaserSCT_DigitizationDbg.py | 4 ----
.../test/SCT_DigitizationConfigNew_test.py | 1 -
.../test/FaserSCT_ClusterizationDbg.py | 4 ----
.../test/StatisticsDbg.py | 4 ----
.../test/TrackerSpacePointFormationDbg.py | 4 ----
.../test/TruthSeededTrackFinderDbg.py | 4 ----
graphics/VTI12/VTI12Algs/share/vti12.py | 4 ++--
version.txt | 2 +-
62 files changed, 160 insertions(+), 158 deletions(-)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_Barrel.h (90%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_BarrelModuleParameters.h (100%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_BarrelParameters.h (100%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_BaseBoard.h (96%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_ComponentFactory.h (98%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_DataBase.h (100%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_DetectorFactory.h (100%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_GeneralParameters.h (100%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_GeometryManager.h (97%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_HalfPlane.h (97%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_Hybrid.h (94%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_Identifier.h (100%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_InnerSide.h (98%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_MaterialManager.h (100%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_Module.h (98%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_Options.h (100%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_OuterSide.h (97%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_Pigtail.h (94%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_Plane.h (96%)
rename Tracker/TrackerDetDescr/FaserSCT_GeoModel/{FaserSCT_GeoModel => src}/SCT_Sensor.h (95%)
diff --git a/Control/CalypsoCommon/python/GlobalFlags.py b/Control/CalypsoCommon/python/GlobalFlags.py
index 4ac04ed3..d620bd8b 100644
--- a/Control/CalypsoCommon/python/GlobalFlags.py
+++ b/Control/CalypsoCommon/python/GlobalFlags.py
@@ -60,7 +60,7 @@ class DetDescrVersion(JobProperty):
# 'Rome-Initial-v00','Rome-Final','DC1-Initial',\
# 'DC1-Final','CTB','Commissioning-Calo','Commissioning-Muon'\
# 'ATLAS-DC3-01','ATLAS-DC3-02','Default']
- StoredValue='FASER-00'
+ StoredValue='FASER-01'
class ConditionsTag(JobProperty):
""" See https://twiki.cern.ch/twiki/bin/view/Atlas/CoolProdTags
diff --git a/Control/CalypsoConfiguration/python/AllConfigFlags.py b/Control/CalypsoConfiguration/python/AllConfigFlags.py
index 263f093b..3112efda 100644
--- a/Control/CalypsoConfiguration/python/AllConfigFlags.py
+++ b/Control/CalypsoConfiguration/python/AllConfigFlags.py
@@ -125,7 +125,8 @@ def _createCfgFlags():
# acf.addFlag("GeoModel.Run", lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('Run',"RUN2")) # Based on CommonGeometryFlags.Run (InDetGeometryFlags.isSLHC replaced by GeoModel.Run=="RUN4")
# acf.addFlag("GeoModel.Type", lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('GeoType',"UNDEFINED")) # Geometry type in {ITKLoI, ITkLoI-VF, etc...}
# acf.addFlag("GeoModel.IBLLayout", lambda prevFlags : GetDetDescrInfo(prevFlags.GeoModel.AtlasVersion).get('IBLlayout',"UNDEFINED")) # IBL layer layout in {"planar", "3D", "noIBL", "UNDEFINED"}
- fcf.addFlag("GeoModel.FaserVersion", lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("GeoFaser",None) or "FASER-00")
+ fcf.addFlag("GeoModel.FaserVersion", lambda prevFlags : GetFileMD(prevFlags.Input.Files).get("GeoFaser",None) or "FASER-01")
+ # fcf.addFlag("GeoModel.FaserVersion", lambda prevFlags : "FASER-01")
fcf.addFlag("GeoModel.GeoExportFile","")
#IOVDbSvc Flags:
diff --git a/Control/CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py b/Control/CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py
index 26b16614..9f96c024 100644
--- a/Control/CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py
+++ b/Control/CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py
@@ -54,7 +54,7 @@ if __name__ == "__main__":
# Flags for this job
ConfigFlags.Input.isMC = True # Needed to bypass autoconfig
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX" # Needed to bypass autoconfig, only the "OFLCOND" matters at the moment
- ConfigFlags.GeoModel.FaserVersion = "FASER-00" # Default FASER geometry
+ ConfigFlags.GeoModel.FaserVersion = "FASER-01" # Default FASER geometry
ConfigFlags.GeoModel.GeoExportFile = "faserGeo.db" # Writes out a GeoModel file with the full geometry tree (optional, comment out to skip)
ConfigFlags.Detector.SimulateVeto = True
ConfigFlags.Detector.SimulateTrigger = True
diff --git a/Control/CalypsoExample/RDOReadExample/python/RDOReadExampleConfig.py b/Control/CalypsoExample/RDOReadExample/python/RDOReadExampleConfig.py
index e5077e5f..0b01cd33 100644
--- a/Control/CalypsoExample/RDOReadExample/python/RDOReadExampleConfig.py
+++ b/Control/CalypsoExample/RDOReadExample/python/RDOReadExampleConfig.py
@@ -27,7 +27,7 @@ if __name__ == "__main__":
# Flags for this job
ConfigFlags.Input.isMC = True # Needed to bypass autoconfig
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX" # Needed to bypass autoconfig, only the "OFLCOND" matters at the moment
- ConfigFlags.GeoModel.FaserVersion = "FASER-00" # Default FASER geometry
+ ConfigFlags.GeoModel.FaserVersion = "FASER-01" # Default FASER geometry
ConfigFlags.Detector.SimulateFaserSCT = True
ConfigFlags.Input.Files = ["my.RDO.pool.root"]
ConfigFlags.lock()
diff --git a/Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig.py b/Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig.py
index f875efc3..ac23e5c3 100644
--- a/Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig.py
+++ b/Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig.py
@@ -46,7 +46,7 @@ if __name__ == "__main__":
# Flags for this job
ConfigFlags.Input.isMC = True # Needed to bypass autoconfig
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX" # Needed to bypass autoconfig, only the "OFLCOND" matters at the moment
- ConfigFlags.GeoModel.FaserVersion = "FASER-00" # Default FASER geometry
+ ConfigFlags.GeoModel.FaserVersion = "FASER-01" # Default FASER geometry
ConfigFlags.GeoModel.GeoExportFile = "faserGeo.db" # Writes out a GeoModel file with the full geometry tree (optional, comment out to skip)
ConfigFlags.Detector.SimulateVeto = True
ConfigFlags.Detector.SimulateTrigger = True
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql b/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
index 61ddbac5..aeaf680e 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
+++ b/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
@@ -597,6 +597,7 @@ INSERT INTO "HVS_TAG2NODE" VALUES (3, "Tracker-01", 100038, NULL, 0, 0, 15907968
INSERT INTO "HVS_TAG2NODE" VALUES (31, "SCT-00", 100026, NULL, 0, 0, 1567987200000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (31, "SCT-01", 100037, NULL, 0, 0, 1159079680000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (32, "Dipole-00", 100027, NULL, 0, 0, 1568678400000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (32, "Dipole-01", 100041, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (310, "SctTopLevel-00", 106788, NULL, 0, 0, 1567987200000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (310, "SctTopLevel-01", 106790, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (311, "SctBarrelModule-00", 107003, NULL, 0, 0, 1567987200000000000, NULL, 22);
@@ -608,6 +609,7 @@ INSERT INTO "HVS_TAG2NODE" VALUES (315, "SctMaterials-00", 107777, NULL, 0, 0, 1
INSERT INTO "HVS_TAG2NODE" VALUES (316, "SctMatComponents-00", 107778, NULL, 0, 0, 1567987200000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (317, "SctConditions-00", 107779, NULL, 0, 0, 1579564800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (320, "DipoleTopLevel-00", 100029, NULL, 0, 0, 1568678400000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (320, "DipoleTopLevel-01", 100040, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (321, "DipoleGeneral-00", 100004, NULL, 0, 0, 1568678400000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (324, "DipoleSwitches-00", 100028, NULL, 0, 0, 1568678400000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (4, "Calorimeter-00", 100003, NULL, 0, 0, 1549238400000000000, NULL, 22);
@@ -689,10 +691,13 @@ INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100037, 315, 107777);
INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100037, 316, 107778);
INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100037, 317, 107779);
INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100002, 32, 100027);
-INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100038, 32, 100027);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100038, 32, 100041);
INSERT INTO "HVS_LTAG2LTAG" VALUES (32, 100027, 320, 100029);
INSERT INTO "HVS_LTAG2LTAG" VALUES (32, 100027, 321, 100004);
INSERT INTO "HVS_LTAG2LTAG" VALUES (32, 100027, 324, 100028);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (32, 100041, 320, 100040);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (32, 100041, 321, 100004);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (32, 100041, 324, 100028);
INSERT INTO "HVS_LTAG2LTAG" VALUES (4, 100003, 4003, 100023);
INSERT INTO "HVS_LTAG2LTAG" VALUES (4, 100003, 4004, 100024);
INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100000, 90, 100013);
@@ -783,8 +788,8 @@ INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "SctSwitches", "SCTSwitche
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "SCTMaterials", "SCTMaterials-00", 107777);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "SCTMatComponents", "SCTMatComponents-00", 107778);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "SctConditions", "SctConditions-00", 107779);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Dipole", "Dipole-00", 100027);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "DipoleTopLevel", "DipoleTopLevel-00", 100029);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Dipole", "Dipole-01", 100041);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "DipoleTopLevel", "DipoleTopLevel-01", 100040);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "DipoleGeneral", "DipoleGeneral-00", 100004);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "DipoleSwitches", "DipoleSwitches-00", 100028);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Calorimeter", "Calorimeter-00", 100003);
@@ -1528,12 +1533,20 @@ INSERT INTO "DIPOLETOPLEVEL_DATA" VALUES(0,0.0,0.0,-750.0,0.0,0.0,0.0,312,'Upstr
INSERT INTO "DIPOLETOPLEVEL_DATA" VALUES(1,0.0,0.0, 700.0,0.0,0.0,0.0,312,'CentralDipole');
INSERT INTO "DIPOLETOPLEVEL_DATA" VALUES(2,0.0,0.0,1900.0,0.0,0.0,0.0,312,'DownstreamDipole');
INSERT INTO "DIPOLETOPLEVEL_DATA" VALUES(3,0.0,0.0, 0.0,0.0,0.0,0.0,312,'Dipole');
+INSERT INTO "DIPOLETOPLEVEL_DATA" VALUES(4,0.0,0.0,-812.32,0.0,0.0,0.0,312,'UpstreamDipole');
+INSERT INTO "DIPOLETOPLEVEL_DATA" VALUES(5,0.0,0.0, 637.726,0.0,0.0,0.0,312,'CentralDipole');
+INSERT INTO "DIPOLETOPLEVEL_DATA" VALUES(6,0.0,0.0,1837.726,0.0,0.0,0.0,312,'DownstreamDipole');
+
DROP TABLE IF EXISTS "DIPOLETOPLEVEL_DATA2TAG";
CREATE TABLE "DIPOLETOPLEVEL_DATA2TAG" ( "DIPOLETOPLEVEL_TAG_ID" SLONGLONG ,"DIPOLETOPLEVEL_DATA_ID" SLONGLONG );
INSERT INTO "DIPOLETOPLEVEL_DATA2TAG" VALUES(100029,0);
INSERT INTO "DIPOLETOPLEVEL_DATA2TAG" VALUES(100029,1);
INSERT INTO "DIPOLETOPLEVEL_DATA2TAG" VALUES(100029,2);
INSERT INTO "DIPOLETOPLEVEL_DATA2TAG" VALUES(100029,3);
+INSERT INTO "DIPOLETOPLEVEL_DATA2TAG" VALUES(100040,3);
+INSERT INTO "DIPOLETOPLEVEL_DATA2TAG" VALUES(100040,4);
+INSERT INTO "DIPOLETOPLEVEL_DATA2TAG" VALUES(100040,5);
+INSERT INTO "DIPOLETOPLEVEL_DATA2TAG" VALUES(100040,6);
--
--
DROP TABLE IF EXISTS "DIPOLEGENERAL_DATA";
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py
index 7030673d..6cd6b1a4 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py
@@ -22,7 +22,7 @@ if __name__ == "__main__":
# Set up logging and new style config
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
- ConfigFlags.addFlag("GeoModel.FaserVersion", "Faser-00")
+ ConfigFlags.addFlag("GeoModel.FaserVersion", "Faser-01")
# ConfigFlags.addFlag("Detector.SimulateVeto", True)
# ConfigFlags.addFlag("Detector.SimulateFaserSCT", True)
# ConfigFlags.addFlag("Detector.SimulateUpstreamDipole", True)
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelConfig.py
index 2b14e217..bda958b6 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelConfig.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelConfig.py
@@ -48,8 +48,7 @@ if __name__ == "__main__":
# from AthenaConfiguration.TestDefaults import defaultTestFiles
# ConfigFlags.Input.Files = defaultTestFiles.RAW
Configurable.configurableRun3Behavior=1
- ConfigFlags.addFlag("GeoModel.FaserVersion", "Faser-00")
- ConfigFlags.GeoModel.FaserVersion = "Faser-00"
+ ConfigFlags.GeoModel.FaserVersion = "Faser-01"
ConfigFlags.lock()
acc = GeoModelCfg( ConfigFlags )
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py
index 3532d3a9..8bc39143 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py
@@ -21,7 +21,7 @@ if __name__ == "__main__":
# Set up logging and new style config
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
- # ConfigFlags.addFlag("GeoModel.FaserVersion", "Faser-00")
+ ConfigFlags.addFlag("GeoModel.FaserVersion", "Faser-01")
# ConfigFlags.addFlag("Detector.SimulateVeto", True)
# ConfigFlags.addFlag("Detector.SimulateFaserSCT", True)
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
index b2f9bdda..8e62384a 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py
@@ -30,7 +30,7 @@ if __name__ == "__main__":
# Set up logging and new style config
log.setLevel(DEBUG)
Configurable.configurableRun3Behavior = True
- # ConfigFlags.addFlag("GeoModel.FaserVersion", "Faser-00")
+ ConfigFlags.addFlag("GeoModel.FaserVersion", "Faser-01")
# ConfigFlags.addFlag("Detector.SimulateVeto", True)
# from AthenaConfiguration.TestDefaults import defaultTestFiles
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py b/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
index df77078c..6d48c59c 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
+++ b/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py
@@ -20,8 +20,7 @@ if __name__ == "__main__":
from AthenaConfiguration.TestDefaults import defaultTestFiles
# Provide MC input
ConfigFlags.Input.Files = defaultTestFiles.EVNT
- # ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
- ConfigFlags.GeoModel.FaserVersion = "FASER-00"
+ ConfigFlags.GeoModel.FaserVersion = "FASER-01"
ConfigFlags.Detector.SimulateVeto = True
ConfigFlags.Detector.SimulateFaserSCT = True
ConfigFlags.Detector.SimulateUpstreamDipole = True
diff --git a/MagneticField/FaserBFieldData/share/translateBFieldMap.C b/MagneticField/FaserBFieldData/share/translateBFieldMap.C
index d11deb50..e77f9ee4 100644
--- a/MagneticField/FaserBFieldData/share/translateBFieldMap.C
+++ b/MagneticField/FaserBFieldData/share/translateBFieldMap.C
@@ -118,8 +118,18 @@ translateBFieldMap(std::string inFile,
xmax = xRaw.back();
ymin = -yRaw.back();
ymax = yRaw.back();
- zmin = -1700.0;
- zmax = 2600.0;
+
+// DIPOLE-00 values
+// zmin = -1700.0;
+// zmax = 2600.0;
+
+// For DIPOLE-01 (May 2020)
+// Upstream: -1562.32 -> -62.32
+// Central: 137.726 -> 1137.726
+// Downstream: 1337.726 -> 2337.726
+ zmin = -1762.3;
+ zmax = 2537.7;
+
nmeshx = maxmeshx;
nmeshy = maxmeshy;
nmeshz = maxmeshz;
@@ -164,7 +174,7 @@ translateBFieldMap(std::string inFile,
{
mirrorVertical = (mirrorVertical && (iy >= 0))||(!mirrorVertical && (iy < 0));
double verticalSign = (mirrorVertical ? -1.0 : 1.0);
- int iyRaw = std::abs(iy);
+ int iyRaw = std::abs(iy);
for (int iz = -340; iz <= 520; iz++)
{
int izRaw;
diff --git a/Simulation/G4Faser/G4FaserAlg/test/runG4.py b/Simulation/G4Faser/G4FaserAlg/test/runG4.py
index dcf8769e..23db5b96 100644
--- a/Simulation/G4Faser/G4FaserAlg/test/runG4.py
+++ b/Simulation/G4Faser/G4FaserAlg/test/runG4.py
@@ -42,12 +42,10 @@ if __name__ == "__main__":
ConfigFlags.Common.isOnline = False
ConfigFlags.Beam.Type = "collisions"
ConfigFlags.Beam.Energy = 7*TeV # Informational, does not affect simulation
- ConfigFlags.GeoModel.FaserVersion = "FASER-00" # Always needed
+ ConfigFlags.GeoModel.FaserVersion = "FASER-01" # Always needed
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX" # Always needed; only the OFLCOND part matters
# Workaround for bug/missing flag; unimportant otherwise
ConfigFlags.addFlag("Input.InitialTimeStamp", 0)
-# Workaround to avoid failing metadata peek
- ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig
# Workaround to avoid problematic ISF code
ConfigFlags.GeoModel.Layout = "Development"
#
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/FaserSCT_DetectorTool.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/FaserSCT_DetectorTool.cxx
index 4cac04e0..b364a791 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/FaserSCT_DetectorTool.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/FaserSCT_DetectorTool.cxx
@@ -4,10 +4,10 @@
#include "FaserSCT_GeoModel/FaserSCT_DetectorTool.h"
-#include "FaserSCT_GeoModel/SCT_DetectorFactory.h"
-#include "FaserSCT_GeoModel/SCT_DataBase.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_Options.h"
+#include "SCT_DetectorFactory.h"
+#include "SCT_DataBase.h"
+#include "SCT_MaterialManager.h"
+#include "SCT_Options.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
#include "DetDescrConditions/AlignableTransformContainer.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.cxx
index 55748efd..95caef05 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.cxx
@@ -2,16 +2,16 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_Barrel.h"
+#include "SCT_Barrel.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
+#include "SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_BarrelParameters.h"
-#include "FaserSCT_GeoModel/SCT_GeneralParameters.h"
-#include "FaserSCT_GeoModel/SCT_Identifier.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_BarrelParameters.h"
+#include "SCT_GeneralParameters.h"
+#include "SCT_Identifier.h"
-#include "FaserSCT_GeoModel/SCT_Plane.h"
+#include "SCT_Plane.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
@@ -54,6 +54,8 @@ SCT_Barrel::getParameters()
m_numLayers = parameters->numLayers();
m_layerPitch = parameters->layerPitch();
+ m_phiStagger = parameters->phiStagger();
+
// Set numerology
m_detectorManager->numerology().setNumLayers(m_numLayers);
for (int i = 0; i < m_numLayers; i++)
@@ -68,7 +70,7 @@ SCT_Barrel::preBuild()
{
m_plane = new SCT_Plane("Plane", m_detectorManager, m_geometryManager, m_materials);
m_width = m_plane->width() + m_safety;
- m_height = m_plane->height() + m_safety;
+ m_height = m_plane->height() + (m_numLayers - 1) * std::fabs(m_phiStagger) + m_safety;
m_thickness = m_plane->thickness() * m_numLayers + m_layerPitch * (m_numLayers - 1) + m_safety;
// Create the barrel volume
@@ -93,7 +95,7 @@ SCT_Barrel::build(SCT_Identifier id)
barrel->add(new GeoIdentifierTag(iLayer)); // Identifier layer= iLayer
id.setLayer(iLayer);
GeoAlignableTransform* transform = new GeoAlignableTransform(GeoTrf::Translate3D(0.0,
- 0.0,
+ (iLayer - (m_numLayers-1)/2.0) * m_phiStagger ,
(layerThickness - activeDepth)/2 + iLayer * m_layerPitch) );
barrel->add(transform);
GeoVPhysVol * planePV = m_plane->build(id);
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Barrel.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.h
similarity index 90%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Barrel.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.h
index 63a780e1..2654cb8d 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Barrel.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.h
@@ -5,7 +5,7 @@
#ifndef FASERSCT_GEOMODEL_SCT_BARREL_H
#define FASERSCT_GEOMODEL_SCT_BARREL_H
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
class GeoVPhysVol;
class GeoFullPhysVol;
@@ -29,6 +29,7 @@ public:
double width() const {return m_width;}
double height() const {return m_height;}
double thickness() const {return m_thickness;}
+ double phiStagger() const { return m_phiStagger; }
private:
void getParameters();
@@ -42,6 +43,7 @@ private:
double m_width;
double m_height;
double m_thickness;
+ double m_phiStagger;
double m_safety;
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelModuleParameters.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelModuleParameters.cxx
index 39bb7ca8..2f9b4bbf 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelModuleParameters.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelModuleParameters.cxx
@@ -2,10 +2,10 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_BarrelModuleParameters.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
+#include "SCT_BarrelModuleParameters.h"
+#include "SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_DataBase.h"
+#include "SCT_DataBase.h"
#include "RDBAccessSvc/IRDBRecord.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BarrelModuleParameters.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelModuleParameters.h
similarity index 100%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BarrelModuleParameters.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelModuleParameters.h
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelParameters.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelParameters.cxx
index cb48aed9..a824fad2 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelParameters.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelParameters.cxx
@@ -2,10 +2,10 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_BarrelParameters.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
+#include "SCT_BarrelParameters.h"
+#include "SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_DataBase.h"
+#include "SCT_DataBase.h"
#include "RDBAccessSvc/IRDBRecord.h"
#include "GaudiKernel/SystemOfUnits.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BarrelParameters.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelParameters.h
similarity index 100%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BarrelParameters.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelParameters.h
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BaseBoard.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BaseBoard.cxx
index 3a65563d..814985f4 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BaseBoard.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BaseBoard.cxx
@@ -2,13 +2,13 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_BaseBoard.h"
+#include "SCT_BaseBoard.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
+#include "SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_BarrelModuleParameters.h"
-#include "FaserSCT_GeoModel/SCT_GeneralParameters.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_BarrelModuleParameters.h"
+#include "SCT_GeneralParameters.h"
#include "GeoModelKernel/GeoBox.h"
#include "GeoModelKernel/GeoLogVol.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BaseBoard.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BaseBoard.h
similarity index 96%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BaseBoard.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BaseBoard.h
index 2b443796..03c9a5e6 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BaseBoard.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BaseBoard.h
@@ -5,7 +5,7 @@
#ifndef FASERSCT_GEOMODEL_SCT_BaseBoard_H
#define FASERSCT_GEOMODEL_SCT_BaseBoard_H
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
#include <string>
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_ComponentFactory.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_ComponentFactory.cxx
index 1ecd5d37..cfd07580 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_ComponentFactory.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_ComponentFactory.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
#include "GaudiKernel/SystemOfUnits.h"
#include <sstream>
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_ComponentFactory.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_ComponentFactory.h
similarity index 98%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_ComponentFactory.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_ComponentFactory.h
index 01aa0e27..6a95df1a 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_ComponentFactory.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_ComponentFactory.h
@@ -5,7 +5,7 @@
#ifndef FASERSCT_GEOMODEL_SCT_COMPONENTFACTORY_H
#define FASERSCT_GEOMODEL_SCT_COMPONENTFACTORY_H
-#include "FaserSCT_GeoModel/SCT_Identifier.h"
+#include "SCT_Identifier.h"
#include <string>
namespace TrackerDD{class SCT_DetectorManager;}
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DataBase.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DataBase.cxx
index badca6d6..ee36d4b2 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DataBase.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DataBase.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_DataBase.h"
+#include "SCT_DataBase.h"
#include "RDBAccessSvc/IRDBAccessSvc.h"
#include "RDBAccessSvc/IRDBRecordset.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_DataBase.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DataBase.h
similarity index 100%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_DataBase.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DataBase.h
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DetectorFactory.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DetectorFactory.cxx
index 18f7c7c1..b62219d7 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DetectorFactory.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DetectorFactory.cxx
@@ -7,20 +7,19 @@
//
-#include "FaserSCT_GeoModel/SCT_DetectorFactory.h"
+#include "SCT_DetectorFactory.h"
-#include "FaserSCT_GeoModel/SCT_DataBase.h"
-#include "FaserSCT_GeoModel/SCT_Identifier.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_GeneralParameters.h"
+#include "SCT_DataBase.h"
+#include "SCT_Identifier.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_MaterialManager.h"
+#include "SCT_GeneralParameters.h"
#include "TrackerReadoutGeometry/Version.h"
#include "TrackerReadoutGeometry/SiCommonItems.h"
#include "TrackerReadoutGeometry/TrackerDD_Defs.h"
#include "TrackerReadoutGeometry/SCT_ModuleSideDesign.h"
-#include "FaserSCT_GeoModel/SCT_Barrel.h"
-#include "FaserSCT_GeoModel/SCT_DataBase.h"
+#include "SCT_Barrel.h"
#include "FaserSCT_GeoModel/SCT_GeoModelAthenaComps.h"
//
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_DetectorFactory.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DetectorFactory.h
similarity index 100%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_DetectorFactory.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_DetectorFactory.h
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeneralParameters.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeneralParameters.cxx
index b20eebbc..54145f4f 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeneralParameters.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeneralParameters.cxx
@@ -2,8 +2,8 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_GeneralParameters.h"
-#include "FaserSCT_GeoModel/SCT_DataBase.h"
+#include "SCT_GeneralParameters.h"
+#include "SCT_DataBase.h"
#include "RDBAccessSvc/IRDBRecord.h"
#include "RDBAccessSvc/IRDBRecordset.h"
#include "GaudiKernel/SystemOfUnits.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_GeneralParameters.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeneralParameters.h
similarity index 100%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_GeneralParameters.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeneralParameters.h
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeometryManager.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeometryManager.cxx
index 1a3852a6..6c923d0d 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeometryManager.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeometryManager.cxx
@@ -2,15 +2,15 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
+#include "SCT_GeometryManager.h"
#include "TrackerGeoModelUtils/DistortedMaterialManager.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
#include "TrackerReadoutGeometry/SiCommonItems.h"
-#include "FaserSCT_GeoModel/SCT_BarrelParameters.h"
-#include "FaserSCT_GeoModel/SCT_BarrelModuleParameters.h"
-#include "FaserSCT_GeoModel/SCT_DataBase.h"
-#include "FaserSCT_GeoModel/SCT_GeneralParameters.h"
+#include "SCT_BarrelParameters.h"
+#include "SCT_BarrelModuleParameters.h"
+#include "SCT_DataBase.h"
+#include "SCT_GeneralParameters.h"
#include "FaserSCT_GeoModel/SCT_GeoModelAthenaComps.h"
SCT_GeometryManager::SCT_GeometryManager(SCT_DataBase* rdb)
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_GeometryManager.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeometryManager.h
similarity index 97%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_GeometryManager.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeometryManager.h
index fbe0c793..a89e3207 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_GeometryManager.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_GeometryManager.h
@@ -5,7 +5,7 @@
#ifndef FASERSCT_GeoModel_SCT_GeometryManager_H
#define FASERSCT_GeoModel_SCT_GeometryManager_H
-#include "FaserSCT_GeoModel/SCT_Options.h"
+#include "SCT_Options.h"
#include <memory>
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_HalfPlane.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_HalfPlane.cxx
index f3be127e..28424913 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_HalfPlane.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_HalfPlane.cxx
@@ -2,13 +2,13 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_HalfPlane.h"
-#include "FaserSCT_GeoModel/SCT_Identifier.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_BarrelParameters.h"
-#include "FaserSCT_GeoModel/SCT_GeneralParameters.h"
-#include "FaserSCT_GeoModel/SCT_Module.h"
+#include "SCT_HalfPlane.h"
+#include "SCT_Identifier.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_MaterialManager.h"
+#include "SCT_BarrelParameters.h"
+#include "SCT_GeneralParameters.h"
+#include "SCT_Module.h"
#include "TrackerGeoModelUtils/ExtraMaterial.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_HalfPlane.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_HalfPlane.h
similarity index 97%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_HalfPlane.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_HalfPlane.h
index 3fa09c9a..6eca1804 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_HalfPlane.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_HalfPlane.h
@@ -5,7 +5,7 @@
#ifndef FASERSCT_GEOMODEL_SCT_HALFPLANE_H
#define FASERSCT_GEOMODEL_SCT_HALFPLANE_H
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
#include <string>
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Hybrid.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Hybrid.cxx
index d8f78c0a..cea31003 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Hybrid.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Hybrid.cxx
@@ -2,12 +2,12 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_Hybrid.h"
+#include "SCT_Hybrid.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
+#include "SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_BarrelModuleParameters.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_BarrelModuleParameters.h"
#include "GeoModelKernel/GeoBox.h"
#include "GeoModelKernel/GeoLogVol.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Hybrid.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Hybrid.h
similarity index 94%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Hybrid.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Hybrid.h
index 92ad19c9..89783127 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Hybrid.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Hybrid.h
@@ -5,7 +5,7 @@
#ifndef FASERSCT_GEOMODEL_SCT_Hybrid_H
#define FASERSCT_GEOMODEL_SCT_Hybrid_H
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
#include <string>
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Identifier.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Identifier.cxx
index bfe91e18..8ea874ba 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Identifier.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Identifier.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_Identifier.h"
+#include "SCT_Identifier.h"
#include "TrackerIdentifier/FaserSCT_ID.h"
#include "Identifier/Identifier.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Identifier.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Identifier.h
similarity index 100%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Identifier.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Identifier.h
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_InnerSide.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_InnerSide.cxx
index 4905997d..739c3d0f 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_InnerSide.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_InnerSide.cxx
@@ -7,18 +7,18 @@
// 28th Mar 2005 S.Mima
// Wed 15th Jun 2005 D.Naito modified.
//
-#include "FaserSCT_GeoModel/SCT_InnerSide.h"
+#include "SCT_InnerSide.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
+#include "SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_BarrelModuleParameters.h"
-#include "FaserSCT_GeoModel/SCT_GeneralParameters.h"
-#include "FaserSCT_GeoModel/SCT_Identifier.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_BarrelModuleParameters.h"
+#include "SCT_GeneralParameters.h"
+#include "SCT_Identifier.h"
// module parts.
-#include "FaserSCT_GeoModel/SCT_Sensor.h"
-#include "FaserSCT_GeoModel/SCT_Hybrid.h"
+#include "SCT_Sensor.h"
+#include "SCT_Hybrid.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_InnerSide.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_InnerSide.h
similarity index 98%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_InnerSide.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_InnerSide.h
index 8aa896f3..7a825b6b 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_InnerSide.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_InnerSide.h
@@ -11,7 +11,7 @@
#define FASERSCT_GEOMODEL_SCT_INNERSIDE_H
#include "GeoPrimitives/GeoPrimitives.h"
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
#include "GeoModelKernel/GeoDefinitions.h"
#include <string>
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_MaterialManager.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_MaterialManager.cxx
index 6efce9ce..080b6331 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_MaterialManager.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_MaterialManager.cxx
@@ -2,10 +2,10 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
+#include "SCT_MaterialManager.h"
#include "GeoModelKernel/GeoMaterial.h"
#include "GeoModelKernel/GeoElement.h"
-#include "FaserSCT_GeoModel/SCT_DataBase.h"
+#include "SCT_DataBase.h"
#include "RDBAccessSvc/IRDBRecordset.h"
#include "StoreGate/StoreGateSvc.h"
#include "GaudiKernel/Bootstrap.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_MaterialManager.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_MaterialManager.h
similarity index 100%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_MaterialManager.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_MaterialManager.h
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Module.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Module.cxx
index 5356dcbe..f69e9d6e 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Module.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Module.cxx
@@ -2,21 +2,21 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_Module.h"
+#include "SCT_Module.h"
-#include "FaserSCT_GeoModel/SCT_Identifier.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
+#include "SCT_Identifier.h"
+#include "SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_BarrelModuleParameters.h"
-#include "FaserSCT_GeoModel/SCT_GeneralParameters.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_BarrelModuleParameters.h"
+#include "SCT_GeneralParameters.h"
-#include "FaserSCT_GeoModel/SCT_Sensor.h"
-#include "FaserSCT_GeoModel/SCT_Hybrid.h"
-#include "FaserSCT_GeoModel/SCT_Pigtail.h"
-#include "FaserSCT_GeoModel/SCT_InnerSide.h"
-#include "FaserSCT_GeoModel/SCT_OuterSide.h"
-#include "FaserSCT_GeoModel/SCT_BaseBoard.h"
+#include "SCT_Sensor.h"
+#include "SCT_Hybrid.h"
+#include "SCT_Pigtail.h"
+#include "SCT_InnerSide.h"
+#include "SCT_OuterSide.h"
+#include "SCT_BaseBoard.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Module.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Module.h
similarity index 98%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Module.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Module.h
index 6be41e1d..1dffe592 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Module.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Module.h
@@ -6,7 +6,7 @@
#define SCT_GEOMODEL_SCT_MODULE_H
#include "GeoPrimitives/GeoPrimitives.h"
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
#include "GeoModelKernel/GeoDefinitions.h"
#include <string>
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Options.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Options.cxx
index 0eb5c372..67fbc40e 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Options.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Options.cxx
@@ -2,7 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_Options.h"
+#include "SCT_Options.h"
SCT_Options::SCT_Options()
: m_g3Compatible(false),
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Options.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Options.h
similarity index 100%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Options.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Options.h
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_OuterSide.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_OuterSide.cxx
index 67a8958f..353c7a2c 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_OuterSide.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_OuterSide.cxx
@@ -2,18 +2,18 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_OuterSide.h"
+#include "SCT_OuterSide.h"
-#include "FaserSCT_GeoModel/SCT_Identifier.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_BarrelModuleParameters.h"
-#include "FaserSCT_GeoModel/SCT_GeneralParameters.h"
+#include "SCT_Identifier.h"
+#include "SCT_MaterialManager.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_BarrelModuleParameters.h"
+#include "SCT_GeneralParameters.h"
// module parts.
-#include "FaserSCT_GeoModel/SCT_Sensor.h"
-#include "FaserSCT_GeoModel/SCT_Hybrid.h"
-#include "FaserSCT_GeoModel/SCT_Pigtail.h"
+#include "SCT_Sensor.h"
+#include "SCT_Hybrid.h"
+#include "SCT_Pigtail.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_OuterSide.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_OuterSide.h
similarity index 97%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_OuterSide.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_OuterSide.h
index 307d4bda..fdb083e0 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_OuterSide.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_OuterSide.h
@@ -6,7 +6,7 @@
#define FASERSCT_GEOMODEL_SCT_OUTERSIDE_H
#include "GeoPrimitives/GeoPrimitives.h"
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
#include "GeoModelKernel/GeoDefinitions.h"
#include <string>
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Pigtail.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Pigtail.cxx
index 3d591676..978fa805 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Pigtail.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Pigtail.cxx
@@ -2,12 +2,12 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_Pigtail.h"
+#include "SCT_Pigtail.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
+#include "SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_BarrelModuleParameters.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_BarrelModuleParameters.h"
#include "GeoModelKernel/GeoBox.h"
#include "GeoModelKernel/GeoLogVol.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Pigtail.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Pigtail.h
similarity index 94%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Pigtail.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Pigtail.h
index 1dd60af1..5705ac41 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Pigtail.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Pigtail.h
@@ -5,7 +5,7 @@
#ifndef FASERSCT_GEOMODEL_SCT_Pigtail_H
#define FASERSCT_GEOMODEL_SCT_Pigtail_H
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
#include <string>
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Plane.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Plane.cxx
index 70e43372..4d6ee3f4 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Plane.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Plane.cxx
@@ -6,14 +6,14 @@
// CPW 17/8/06
// Version using new model of services from A. Tricoli
//
-#include "FaserSCT_GeoModel/SCT_Plane.h"
-#include "FaserSCT_GeoModel/SCT_Identifier.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_BarrelParameters.h"
-#include "FaserSCT_GeoModel/SCT_GeneralParameters.h"
-#include "FaserSCT_GeoModel/SCT_HalfPlane.h"
-#include "FaserSCT_GeoModel/SCT_Module.h"
+#include "SCT_Plane.h"
+#include "SCT_Identifier.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_MaterialManager.h"
+#include "SCT_BarrelParameters.h"
+#include "SCT_GeneralParameters.h"
+#include "SCT_HalfPlane.h"
+#include "SCT_Module.h"
#include "TrackerGeoModelUtils/ExtraMaterial.h"
#include "TrackerReadoutGeometry/SCT_DetectorManager.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Plane.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Plane.h
similarity index 96%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Plane.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Plane.h
index d52658a5..9f75cc97 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Plane.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Plane.h
@@ -6,7 +6,7 @@
#ifndef FASERSCT_GEOMODEL_SCT_PLANE_H
#define FASERSCT_GEOMODEL_SCT_PLANE_H
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
#include <string>
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Sensor.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Sensor.cxx
index d8efd8f1..b98a66d8 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Sensor.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Sensor.cxx
@@ -2,12 +2,12 @@
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
-#include "FaserSCT_GeoModel/SCT_Sensor.h"
+#include "SCT_Sensor.h"
-#include "FaserSCT_GeoModel/SCT_GeometryManager.h"
-#include "FaserSCT_GeoModel/SCT_MaterialManager.h"
+#include "SCT_GeometryManager.h"
+#include "SCT_MaterialManager.h"
-#include "FaserSCT_GeoModel/SCT_BarrelModuleParameters.h"
+#include "SCT_BarrelModuleParameters.h"
#include "GeoModelKernel/GeoBox.h"
#include "GeoModelKernel/GeoLogVol.h"
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Sensor.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Sensor.h
similarity index 95%
rename from Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Sensor.h
rename to Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Sensor.h
index ce8e6248..30d48016 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_Sensor.h
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Sensor.h
@@ -5,7 +5,7 @@
#ifndef FASERSCT_GEOMODEL_SCT_SENSOR_H
#define FASERSCT_GEOMODEL_SCT_SENSOR_H
-#include "FaserSCT_GeoModel/SCT_ComponentFactory.h"
+#include "SCT_ComponentFactory.h"
#include <atomic>
#include <string>
diff --git a/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py b/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py
index a2c53702..b1832fd2 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/test/FaserSCT_DigitizationDbg.py
@@ -26,13 +26,9 @@ ConfigFlags.Input.Files = ['my.HITS.pool.root']
ConfigFlags.Output.RDOFileName = "my.RDO.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX"
ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Concurrency.NumThreads = 1
ConfigFlags.Beam.NumberOfCollisions = 0.
#ConfigFlags.Detector.SimulateFaserSCT = True
-ConfigFlags.GeoModel.FaserVersion = "FASER-00" # Always needed
-ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
-
ConfigFlags.Digitization.TruthOutput = True
ConfigFlags.lock()
diff --git a/Tracker/TrackerDigitization/FaserSCT_Digitization/test/SCT_DigitizationConfigNew_test.py b/Tracker/TrackerDigitization/FaserSCT_Digitization/test/SCT_DigitizationConfigNew_test.py
index 90006a2e..9f111942 100644
--- a/Tracker/TrackerDigitization/FaserSCT_Digitization/test/SCT_DigitizationConfigNew_test.py
+++ b/Tracker/TrackerDigitization/FaserSCT_Digitization/test/SCT_DigitizationConfigNew_test.py
@@ -21,7 +21,6 @@ Configurable.configurableRun3Behavior = True
ConfigFlags.Input.Files = defaultTestFiles.HITS
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX"
ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Concurrency.NumThreads = 1
ConfigFlags.lock()
# Construct our accumulator to run
acc = MainServicesCfg(ConfigFlags)
diff --git a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
index f0a01274..8ba8dece 100644
--- a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/test/FaserSCT_ClusterizationDbg.py
@@ -26,12 +26,8 @@ ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "myClusters.ESD.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX"
ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Concurrency.NumThreads = 1
ConfigFlags.Beam.NumberOfCollisions = 0.
-ConfigFlags.GeoModel.FaserVersion = "FASER-00" # Always needed
-ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
-
ConfigFlags.lock()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
index 614a249e..8b995c3c 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/StatisticsDbg.py
@@ -27,12 +27,8 @@ ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX"
ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Concurrency.NumThreads = 1
ConfigFlags.Beam.NumberOfCollisions = 0.
-ConfigFlags.GeoModel.FaserVersion = "FASER-00" # Always needed
-ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
-
ConfigFlags.lock()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
index 9afb75c9..ad608c89 100644
--- a/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
+++ b/Tracker/TrackerRecAlgs/TrackerSpacePointFormation/test/TrackerSpacePointFormationDbg.py
@@ -27,12 +27,8 @@ ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "mySpacePoints.ESD.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX"
ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Concurrency.NumThreads = 1
ConfigFlags.Beam.NumberOfCollisions = 0.
-ConfigFlags.GeoModel.FaserVersion = "FASER-00" # Always needed
-ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
-
ConfigFlags.lock()
# Core components
diff --git a/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py b/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
index 5d8d9445..7e96fca3 100644
--- a/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
+++ b/Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
@@ -28,12 +28,8 @@ ConfigFlags.Input.Files = ['my.RDO.pool.root']
ConfigFlags.Output.ESDFileName = "mySeeds.ESD.pool.root"
ConfigFlags.IOVDb.GlobalTag = "OFLCOND-XXXX-XXX-XX"
ConfigFlags.GeoModel.Align.Dynamic = False
-ConfigFlags.Concurrency.NumThreads = 1
ConfigFlags.Beam.NumberOfCollisions = 0.
-ConfigFlags.GeoModel.FaserVersion = "FASER-00" # Always needed
-ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # Always needed to fool autoconfig; value ignored
-
ConfigFlags.lock()
# Core components
diff --git a/graphics/VTI12/VTI12Algs/share/vti12.py b/graphics/VTI12/VTI12Algs/share/vti12.py
index 58669c86..0fd3cf28 100644
--- a/graphics/VTI12/VTI12Algs/share/vti12.py
+++ b/graphics/VTI12/VTI12Algs/share/vti12.py
@@ -90,7 +90,7 @@ if (vp1InputFiles == []):
# Set geometry version
if (not "DetDescrVersion" in dir()):
- DetDescrVersion = "FASER-00"
+ DetDescrVersion = "FASER-01"
globalflags.DetDescrVersion = DetDescrVersion
# Set conditions tag
@@ -139,7 +139,7 @@ else:
# Set geometry version
if (not "DetDescrVersion" in dir()):
- DetDescrVersion = "FASER-00"
+ DetDescrVersion = "FASER-01"
globalflags.DetDescrVersion = DetDescrVersion
# Set conditions tag
diff --git a/version.txt b/version.txt
index 99278c76..ce217b91 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-22.0.14
+22.0.15
--
GitLab