diff --git a/Control/CalypsoCommon/python/GlobalFlags.py b/Control/CalypsoCommon/python/GlobalFlags.py
index 4ac04ed3b58bccb254a70aea18ee96e4f09fa028..d620bd8be430ee81aad8ed285bc6f73074c32bb0 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 263f093b1708f279e90ffcb1393c925031d3d566..3112efda98018b89a3ae2ca070024b99e6f63f34 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 26b16614da6e826fb5d0922c16ccbb25bc16f423..9f96c024ed0919312c25e9190aba3ad55ee33bdc 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 e5077e5f4260ae23c3b338a09fedbe2a383fd554..0b01cd33fed81b6c6ea5bedbd29db85586b20d59 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 f875efc3c020f4edccf71e99a4c7679351e1c908..ac23e5c38353cae83c583f61d5149158de3e513a 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 61ddbac550b693c1d5c814f1e4a1862c4f57b516..aeaf680e87f287b54de9507c2adbf1a631447208 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 7030673d577076d94e77491c799c0210bc131b2f..6cd6b1a4b13f1fde239e07b045f8a369e8ece794 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 2b14e217fb20ec6f7abc72075420dd98fc251d0c..bda958b6032c93adbb4ed95b16893a1a212bc138 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 3532d3a958f95efa17e9fdad813eb4fed30c8662..8bc39143de1ec761894becacf54d514d63adbcac 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 b2f9bddadde0d34e6b4ca3fbbe5dc7e2f6d4df9d..8e62384aaa7113fbd4a978e6b07f059cedfb7afd 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 df77078c8a1b4b40830ed08c0a9e99d528c69bbf..6d48c59c1b82a8a70edfef8aaa82fb5fa8b54026 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 d11deb504bfa315660ad7002c77181f8b1efce47..e77f9ee4fe43536771dce9338dacf538a0cb8954 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 dcf8769e84a59d1dd2c95d54de99dfd84fbf13bd..23db5b96d98c132f0f6040c7f0183420f2dcd6e0 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 4cac04e0c4d74bb3068712121ac3f51f077cfce4..b364a791993d2733a5d6ce50acbc60b2df80c77c 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 55748efd38e872a9ffbca8416185d2a459c24146..95caef05d0d31aa6cc8155942870e8d796626950 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 63a780e167de903702b489d9b0554e525579a8ae..2654cb8dacc8375a867ea3d875c8238148db976b 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 39bb7ca809d251517a17def6cc82fe0e82c523c5..2f9b4bbf68111dd864bcf4b8c9bb06e41fd6b055 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 cb48aed9ead807cba70fb655f152c54647d56541..a824fad274f7c9fff2750e797a424d03104627b3 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 3a65563dbf28114047e58b6d22acf4b0f503dd56..814985f4b33d18939a3a6cf860c00f6d17ef70a2 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 2b443796030b925af7a97dda6b264375007e55be..03c9a5e684e01642b1454b4435983411e4b29945 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 1ecd5d372cf18dc1d94b3bbedd3355fbd6f7b89e..cfd075806d4ad08909a49f743af0d5deed2125ab 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 01aa0e276acfa707d4dbce11538fec48e1e79cbd..6a95df1a8da8144c91b02cae305c93e066fddc5e 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 badca6d6aed8f5e0b611903fb7f0f047550a61c7..ee36d4b283f7e4cf46a4c5e3a40ad2248f5a7d1d 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 18f7c7c18728875b298113603b4719a835270c62..b62219d710a31eee6e45831f823a6c00113c644d 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 b20eebbca31c6b8b702cb4d4b6b92b8692522f5c..54145f4fc057eb96685cea62d3591fa45152b63f 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 1a3852a64c842b38760648dd7815c33c0f48eca7..6c923d0d964e0d33247770453a98ac14871b6cdc 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 fbe0c79373b555cfc6852cdf3b4b40622bc9f3b0..a89e320796ac2db115da2986f92ffa0f42014223 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 f3be127ef462622d4b1826dc5b5a71bb2654660c..284249137b54f4f0ee27f930e977e039fcfaa4aa 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 3fa09c9ad87e0fb1688d62e302cc4744286155c8..6eca180471aa5c5ad528df4089e15c87adfd0f15 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 d8f78c0a6d61fa22f85ab97d98ea35389b7f69d8..cea3100315336fc47452ee04a43fc0a9bb268d89 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 92ad19c92c969683fed50077a06c45941e1c95bf..89783127f356880e55d513b58079c00605ecae36 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 bfe91e182d34c290e9f7e1a713e11196395aa6af..8ea874ba2cc49afe710823e0bd9ff9a311b0d3b1 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 4905997d4453670c44b7908cc15aaa8b32e222f0..739c3d0f517d40f4b2d89e0825cd07237516545f 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 8aa896f3a7cc98b79dd227d9cc0674ffeef97d99..7a825b6b30fbb6c074ac03585620081ecf0b70f4 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 6efce9ce9b11c36db64897477d719982272641fc..080b63311ac12c1a57e2d90318db8684a91addf9 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 5356dcbea783b9a917410405a218e2a97c64c519..f69e9d6e76a3c31f68f0eaa44c05b301a8a2ec63 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 6be41e1deb4fc802d41f3dd31792d9337f792ff8..1dffe59256488f42fa9d212db31df5f3db192a6a 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 0eb5c3721e330ac1016805e69ff99a1f24d5e872..67fbc40eb6266f8e98f9e04e686ea9dbec335d84 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 67a8958fc74422b829dc0f34eebd17822a559f0c..353c7a2c2a8e095a3f6714d0be8bb181a05ebb2c 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 307d4bdaeca8b3251d3e39b65ae2d059d4889f01..fdb083e08ee8f5999005034290f338b1248c024c 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 3d59167658ef57b89a6ffcc13fe270387f52f8d1..978fa8058af6af7398ec65db1ca58b0b727478cb 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 1dd60af167f7bcd33cf40a70e1a497d2faf575b8..5705ac414c1b1055327012f390b7d987e640f4a5 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 70e433725204a90c67b78db8a6b90a8829992dba..4d6ee3f470e035b271078b90a51da1798df3d9fd 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 d52658a5f25e9031847b1fdd2c87fadb391cd496..9f75cc97018a11997a2eba62dd1e024b5c7ba87f 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 d8efd8f1ec456fa6f4aaac716fde8c7b71d2b9e8..b98a66d842ba099fe2fba5a4571deb7853876b56 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 ce8e624874bb53459c93a643cf31c7f38d236c19..30d480167bbb1d1e13801041609589fe5b23c434 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 a2c53702015998e93ee9d4368e416e4908fd2882..b1832fd2b3424a6856eb32fffdbb223031fc10bc 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 90006a2e24f032596adef46300960232e196ab0d..9f111942d0f688f0e63fb46d8d658ba510e5cb1b 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 f0a01274887b010e290228cc5d8f52a97981175f..8ba8dece12f9c47693a38aa79daae3e75180a479 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 614a249efd38eaa13625c96a2f2544b5e194cd9c..8b995c3c2c81cbbae7f6fa2e68211431b17e0cad 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 9afb75c91c79b11c135b92b2e55668157057b1c6..ad608c89177efef40e6a5112ad14a252f8d8de65 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 5d8d944509c4a5233dc044a8e5b2e5a771a47bbe..7e96fca34691af58f9406d5ee8319684dd1c7f11 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 58669c867ed8c3bb22d23e7b477dd39b7da7a927..0fd3cf28ba27b2b3432616664197b5b286971fc8 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 99278c76a6bb42b6cda25a73efd1ca8ca6f83084..ce217b910b2bf83e79ac798599669ed2fffec82f 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-22.0.14
+22.0.15