From d26bcbfb6edf5e2717dc8a2f9c234c9eef10abb0 Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Sat, 30 May 2020 16:53:44 -0700
Subject: [PATCH] Scintillator positions from CAD
---
.../GeoModel/FaserGeoModel/data/geomDB.sql | 96 ++++++++++++++-----
.../src/PreshowerStation.cxx | 2 +-
.../TriggerGeoModel/src/TriggerStation.cxx | 8 +-
.../VetoGeoModel/src/VetoStation.cxx | 2 +-
.../FaserSCT_GeoModel/src/SCT_Barrel.cxx | 4 +-
5 files changed, 80 insertions(+), 32 deletions(-)
diff --git a/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql b/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
index aeaf680e8..29d34d891 100644
--- a/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
+++ b/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
@@ -592,6 +592,7 @@ INSERT INTO "HVS_TAG2NODE" VALUES (11,"Emulsion-00", 100034, NULL, 0, 0, 1582416
INSERT INTO "HVS_TAG2NODE" VALUES (110, "EmulsionTopLevel-00", 100035, NULL, 0, 0, 1582416000000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (114, "EmulsionSwitches-00", 100036, NULL, 0, 0, 1582416000000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (2, "Scintillator-00", 100001, NULL, 0, 0, 1549238400000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (2, "Scintillator-01", 100042, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (3, "Tracker-00", 100002, NULL, 0, 0, 1549238400000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (3, "Tracker-01", 100038, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (31, "SCT-00", 100026, NULL, 0, 0, 1567987200000000000, NULL, 22);
@@ -614,13 +615,20 @@ INSERT INTO "HVS_TAG2NODE" VALUES (321, "DipoleGeneral-00", 100004, NULL, 0, 0,
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);
INSERT INTO "HVS_TAG2NODE" VALUES (210, "VetoTopLevel-00", 100009, NULL, 0, 0, 1567123200000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (210, "VetoTopLevel-01", 100046, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (211, "VetoStationGeneral-00", 100010, NULL, 0, 0, 1567123200000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (212, "VetoPlateGeneral-00", 100025, NULL, 0, 0, 1567209600000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (211, "VetoStationGeneral-01", 100049, NULL, 0, 0, 1590796800000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (212, "VetoPlateGeneral-01", 100050, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (220, "TriggerTopLevel-00", 110009, NULL, 0, 0, 1581292800000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (220, "TriggerTopLevel-01", 100047, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (221, "TriggerStationGeneral-00", 110010, NULL, 0, 0, 1581292800000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (221, "TriggerStationGeneral-01", 100051, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (222, "TriggerPlateGeneral-00", 110025, NULL, 0, 0, 1581292800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (230, "PreshowerTopLevel-00", 120009, NULL, 0, 0, 1581292800000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (230, "PreshowerTopLevel-01", 100048, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (231, "PreshowerStationGeneral-00", 120010, NULL, 0, 0, 1581292800000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (231, "PreshowerStationGeneral-01", 100052, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (232, "PreshowerPlateGeneral-00", 120025, NULL, 0, 0, 1581292800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (1003, "NeutrinoMaterials-00", 100032, NULL, 0, 0, 1582416000000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (1004, "NeutrinoMatComponents-00", 100033, NULL, 0, 0, 1582416000000000000, NULL, 22);
@@ -636,13 +644,16 @@ INSERT INTO "HVS_TAG2NODE" VALUES (234, "PreshowerSwitches-00", 120014, NULL, 0
INSERT INTO "HVS_TAG2NODE" VALUES (21, "Veto-00", 100015, NULL, 0, 0, 1550448000000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (22, "Trigger-00", 100019, NULL, 0, 0, 1550448000000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (23, "Preshower-00", 100020, NULL, 0, 0, 1550448000000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (21, "Veto-01", 100043, NULL, 0, 0, 1590796800000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (22, "Trigger-01", 100044, NULL, 0, 0, 1590796800000000000, NULL, 22);
+INSERT INTO "HVS_TAG2NODE" VALUES (23, "Preshower-01", 100045, NULL, 0, 0, 1590796800000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (1005, "NeutrinoIdentifier-00", 100030, NULL, 0, 0, 1582416000000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (2005, "ScintIdentifier-00", 100016, NULL, 0, 0, 1550448000000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (3005, "TrackerIdentifier-00", 100017, NULL, 0, 0, 1550448000000000000, NULL, 22);
INSERT INTO "HVS_TAG2NODE" VALUES (4005, "CaloIdentifier-00", 100018, NULL, 0, 0, 1550448000000000000, NULL, 22);
-- Data for the HVS_LTAG2LTAG table
INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100000, 2, 100001);
-INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100039, 2, 100001);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100039, 2, 100042);
INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100000, 3, 100002);
INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100039, 3, 100038);
INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100000, 4, 100003);
@@ -658,16 +669,28 @@ INSERT INTO "HVS_LTAG2LTAG" VALUES (11, 100034, 114, 100036);
INSERT INTO "HVS_LTAG2LTAG" VALUES (1, 100031, 1003, 100032);
INSERT INTO "HVS_LTAG2LTAG" VALUES (1, 100031, 1004, 100033);
INSERT INTO "HVS_LTAG2LTAG" VALUES (21, 100015, 210, 100009);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (21, 100043, 210, 100046);
INSERT INTO "HVS_LTAG2LTAG" VALUES (21, 100015, 211, 100010);
INSERT INTO "HVS_LTAG2LTAG" VALUES (21, 100015, 212, 100025);
-INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 110015, 220, 110009);
-INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 110015, 221, 110010);
-INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 110015, 222, 110025);
-INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 120015, 230, 120009);
-INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 120015, 231, 120010);
-INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 120015, 232, 120025);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (21, 100043, 211, 100049);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (21, 100043, 212, 100050);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 100019, 220, 110009);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 100044, 220, 100047);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 100019, 221, 110010);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 100044, 221, 100051);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 100019, 222, 110025);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 100044, 221, 110010);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 100044, 222, 110025);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 100020, 230, 120009);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 100045, 230, 120048);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 100020, 231, 120010);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 100045, 231, 100052);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 100020, 232, 120025);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 100045, 232, 120025);
INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100001, 2003, 100011);
INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100001, 2004, 100012);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100042, 2003, 100011);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100042, 2004, 100012);
INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100002, 3003, 100021);
INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100002, 3004, 100022);
INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100038, 3003, 100021);
@@ -705,11 +728,18 @@ INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100039, 90, 100013);
INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100001, 21, 100015);
INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100001, 22, 100019);
INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100001, 23, 100020);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100042, 21, 100043);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100042, 22, 100044);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100042, 23, 100045);
INSERT INTO "HVS_LTAG2LTAG" VALUES (21, 100015, 214, 100014);
-INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 110015, 224, 110014);
-INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 120015, 234, 120014);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (21, 100043, 214, 100014);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 100019, 224, 110014);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (22, 100044, 224, 110014);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 100020, 234, 120014);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 100045, 234, 120014);
INSERT INTO "HVS_LTAG2LTAG" VALUES (1, 100031, 1005, 100030);
INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100001, 2005, 100016);
+INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100042, 2005, 100016);
INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100002, 3005, 100017);
INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100038, 3005, 100017);
INSERT INTO "HVS_LTAG2LTAG" VALUES (4, 100003, 4005, 100018);
@@ -777,7 +807,7 @@ INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Neutrino", "Neutrino-0
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Emulsion", "Emulsion-00", 100034);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "EmulsionTopLevel", "EmulsionTopLevel-00", 100035);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "EmulsionSwitches", "EmulsionSwitches-00", 100036);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Scintillator", "Scintillator-00", 100001);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Scintillator", "Scintillator-01", 100042);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Tracker", "Tracker-01", 100038);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "SCT", "SCT-01", 100037);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "SctTopLevel", "SCTTopLevel-01", 106790);
@@ -793,14 +823,14 @@ INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "DipoleTopLevel", "DipoleTopL
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);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "VetoTopLevel", "VetoTopLevel-00", 100009);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "VetoStationGeneral", "VetoStationGeneral-00", 100010);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "VetoPlateGeneral", "VetoPlateGeneral-00", 100025);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "TriggerTopLevel", "TriggerTopLevel-00", 110009);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "TriggerStationGeneral", "TriggerStationGeneral-00", 110010);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "VetoTopLevel", "VetoTopLevel-01", 100046);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "VetoStationGeneral", "VetoStationGeneral-01", 100049);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "VetoPlateGeneral", "VetoPlateGeneral-01", 100050);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "TriggerTopLevel", "TriggerTopLevel-01", 100047);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "TriggerStationGeneral", "TriggerStationGeneral-01", 100051);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "TriggerPlateGeneral", "TriggerPlateGeneral-00", 110025);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "PreshowerTopLevel", "PreshowerTopLevel-00", 120009);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "PreshowerStationGeneral", "PreshowerStationGeneral-00", 120010);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "PreshowerTopLevel", "PreshowerTopLevel-01", 100048);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "PreshowerStationGeneral", "PreshowerStationGeneral-01", 100052);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "PreshowerPlateGeneral", "PreshowerPlateGeneral-00", 120025);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "NeutrinoMaterials", "NeutrinoMaterials-00", 100032);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "NeutrinoMatComponents", "NeutrinoMatComponents-00", 100033);
@@ -813,9 +843,9 @@ INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "CaloMatComponents", "CaloMatComp
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "VetoSwitches", "VetoSwitches-00", 100014);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "TriggerSwitches", "TriggerSwitches-00", 110014);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "PreshowerSwitches", "PreshowerSwitches-00", 120014);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Veto", "Veto-00", 100015);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Trigger", "Trigger-00", 100019);
-INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Preshower", "Preshower-00", 100020);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Veto", "Veto-01", 100043);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Trigger", "Trigger-01", 100044);
+INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Preshower", "Preshower-01", 100045);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "NeutrinoIdentifier", "NeutrinoIdentifier-00", 100030);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "ScintIdentifier", "ScintIdentifier-00", 100016);
INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "TrackerIdentifier", "TrackerIdentifier-00", 100017);
@@ -1366,28 +1396,41 @@ INSERT INTO "ELEMENTS_DATA2TAG" VALUES (100008, 91);
INSERT INTO "VETOTOPLEVEL_DATA" VALUES (0, 0.0, 0.0, -1725.0, 0.0, 0.0, 0.0, 321, "Veto");
INSERT INTO "VETOTOPLEVEL_DATA" VALUES (1, 0.0, 0.0, -160.0, 0.0, 0.0, 0.0, 321, "StationA");
INSERT INTO "VETOTOPLEVEL_DATA" VALUES (2, 0.0, 0.0, 160.0, 0.0, 0.0, 0.0, 321, "StationB");
+INSERT INTO "VETOTOPLEVEL_DATA" VALUES (3, 0.0, 0.0, -1709.0, 0.0, 0.0, 0.0, 321, "Veto");
+INSERT INTO "VETOTOPLEVEL_DATA" VALUES (4, 0.0, 0.0, -100.0, 0.0, 0.0, 0.0, 321, "StationA");
+INSERT INTO "VETOTOPLEVEL_DATA" VALUES (5, 0.0, 0.0, 100.0, 0.0, 0.0, 0.0, 321, "StationB");
INSERT INTO "VETOTOPLEVEL_DATA2TAG" VALUES (100009, 0);
INSERT INTO "VETOTOPLEVEL_DATA2TAG" VALUES (100009, 1);
INSERT INTO "VETOTOPLEVEL_DATA2TAG" VALUES (100009, 2);
+INSERT INTO "VETOTOPLEVEL_DATA2TAG" VALUES (100046, 3);
+INSERT INTO "VETOTOPLEVEL_DATA2TAG" VALUES (100046, 4);
+INSERT INTO "VETOTOPLEVEL_DATA2TAG" VALUES (100046, 5);
--
--
INSERT INTO "VETOSTATIONGENERAL_DATA" VALUES (0, 2, 100.0);
+INSERT INTO "VETOSTATIONGENERAL_DATA" VALUES (1, 2, 20.0);
INSERT INTO "VETOSTATIONGENERAL_DATA2TAG" VALUES (100010, 0);
+INSERT INTO "VETOSTATIONGENERAL_DATA2TAG" VALUES (100049, 1);
--
INSERT INTO "VETOPLATEGENERAL_DATA" VALUES (0, 1, 300.0, 300.0, 20.0, "scint::Scintillator");
+INSERT INTO "VETOPLATEGENERAL_DATA" VALUES (1, 1, 300.0, 300.0, 19.5, "scint::Scintillator");
INSERT INTO "VETOPLATEGENERAL_DATA2TAG" VALUES (100025, 0);
+INSERT INTO "VETOPLATEGENERAL_DATA2TAG" VALUES (100050, 1);
--
--
INSERT INTO "TRIGGERTOPLEVEL_DATA" VALUES (0, 0.0, 0.0, 187.0, 0.0, 0.0, 0.0, 321, "Trigger");
INSERT INTO "TRIGGERTOPLEVEL_DATA" VALUES (1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 321, "StationA");
---INSERT INTO "TRIGGERTOPLEVEL_DATA" VALUES (2, 0.0, 0.0, 160.0, 0.0, 0.0, 0.0, 321, "StationB");
+INSERT INTO "TRIGGERTOPLEVEL_DATA" VALUES (2, 0.0, -5.0, -28.9, 0.0, 0.0, 0.0, 321, "Trigger");
INSERT INTO "TRIGGERTOPLEVEL_DATA2TAG" VALUES (110009, 0);
INSERT INTO "TRIGGERTOPLEVEL_DATA2TAG" VALUES (110009, 1);
---INSERT INTO "TRIGGERTOPLEVEL_DATA2TAG" VALUES (110009, 2);
+INSERT INTO "TRIGGERTOPLEVEL_DATA2TAG" VALUES (100047, 1);
+INSERT INTO "TRIGGERTOPLEVEL_DATA2TAG" VALUES (100047, 2);
--
--
INSERT INTO "TRIGGERSTATIONGENERAL_DATA" VALUES (0, 2, 195.0, 11.0);
+INSERT INTO "TRIGGERSTATIONGENERAL_DATA" VALUES (1, 2, 196.0, 14.9);
INSERT INTO "TRIGGERSTATIONGENERAL_DATA2TAG" VALUES (110010, 0);
+INSERT INTO "TRIGGERSTATIONGENERAL_DATA2TAG" VALUES (100051, 1);
--
INSERT INTO "TRIGGERPLATEGENERAL_DATA" VALUES (0, 2, 400.0, 200.0, 10.0, "scint::Scintillator");
INSERT INTO "TRIGGERPLATEGENERAL_DATA2TAG" VALUES (110025, 0);
@@ -1395,14 +1438,17 @@ INSERT INTO "TRIGGERPLATEGENERAL_DATA2TAG" VALUES (110025, 0);
--
INSERT INTO "PRESHOWERTOPLEVEL_DATA" VALUES (0, 0.0, 0.0, 2626.0, 0.0, 0.0, 0.0, 321, "Preshower");
INSERT INTO "PRESHOWERTOPLEVEL_DATA" VALUES (1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 321, "StationA");
---INSERT INTO "PRESHOWERTOPLEVEL_DATA" VALUES (2, 0.0, 0.0, 160.0, 0.0, 0.0, 0.0, 321, "StationB");
+INSERT INTO "PRESHOWERTOPLEVEL_DATA" VALUES (2, 0.0, 0.0, 2662.7, 0.0, 0.0, 0.0, 321, "Preshower");
INSERT INTO "PRESHOWERTOPLEVEL_DATA2TAG" VALUES (120009, 0);
INSERT INTO "PRESHOWERTOPLEVEL_DATA2TAG" VALUES (120009, 1);
---INSERT INTO "PRESHOWERTOPLEVEL_DATA2TAG" VALUES (120009, 2);
+INSERT INTO "PRESHOWERTOPLEVEL_DATA2TAG" VALUES (100048, 1);
+INSERT INTO "PRESHOWERTOPLEVEL_DATA2TAG" VALUES (100048, 2);
--
--
INSERT INTO "PRESHOWERSTATIONGENERAL_DATA" VALUES (0, 2, 80.0);
+INSERT INTO "PRESHOWERSTATIONGENERAL_DATA" VALUES (1, 2, 82.0);
INSERT INTO "PRESHOWERSTATIONGENERAL_DATA2TAG" VALUES (120010, 0);
+INSERT INTO "PRESHOWERSTATIONGENERAL_DATA2TAG" VALUES (100052, 1);
--
INSERT INTO "PRESHOWERPLATEGENERAL_DATA" VALUES (0, 1, 300.0, 300.0, 20.0, "scint::Scintillator");
INSERT INTO "PRESHOWERPLATEGENERAL_DATA2TAG" VALUES (120025, 0);
@@ -1496,7 +1542,7 @@ INSERT INTO "SCTTOPLEVEL_DATA2TAG" VALUES(106790,7);
DROP TABLE IF EXISTS "SCTFASERGENERAL_DATA";
CREATE TABLE "SCTFASERGENERAL_DATA" ("SCTFASERGENERAL_DATA_ID" SLONGLONG, "NUMLAYERS" INT, "LAYERPITCH" DOUBLE, "ETAHALFPITCH" DOUBLE, "PHIHALFPITCH" DOUBLE, "DEPTHHALFPITCH" DOUBLE, "SIDEHALFPITCH" DOUBLE, "PHISTAGGER" DOUBLE, UNIQUE ( "SCTFASERGENERAL_DATA_ID") );
INSERT INTO "SCTFASERGENERAL_DATA" VALUES (0, 3, 65.0, 60.0, 30.0, 2.5, 5.0, 0.0);
-INSERT INTO "SCTFASERGENERAL_DATA" VALUES (1, 3, 31.5, 62.0, 31.87, 1.985, 7.945, -5.0);
+INSERT INTO "SCTFASERGENERAL_DATA" VALUES (1, 3, 31.5, 62.0, 31.87, 1.985, 3.9725, -5.0);
DROP TABLE IF EXISTS "SCTFASERGENERAL_DATA2TAG";
CREATE TABLE "SCTFASERGENERAL_DATA2TAG" ( "SCTFASERGENERAL_TAG_ID" SLONGLONG ,"SCTFASERGENERAL_DATA_ID" SLONGLONG );
INSERT INTO "SCTFASERGENERAL_DATA2TAG" VALUES(106789, 0);
diff --git a/Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerStation.cxx b/Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerStation.cxx
index b6cd78cbc..bdd8c5b96 100644
--- a/Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerStation.cxx
+++ b/Scintillator/ScintDetDescr/PreshowerGeoModel/src/PreshowerStation.cxx
@@ -80,7 +80,7 @@ PreshowerStation::build(PreshowerIdentifier id)
GeoFullPhysVol * station = new GeoFullPhysVol(m_logVolume);
- double activeDepth = m_thickness - m_safety/2;
+ double activeDepth = m_thickness - m_safety;
double plateThickness = m_plate->thickness();
for (int iPlate = 0; iPlate < m_numPlates; iPlate++)
{
diff --git a/Scintillator/ScintDetDescr/TriggerGeoModel/src/TriggerStation.cxx b/Scintillator/ScintDetDescr/TriggerGeoModel/src/TriggerStation.cxx
index 7da905ddd..06d5c2432 100644
--- a/Scintillator/ScintDetDescr/TriggerGeoModel/src/TriggerStation.cxx
+++ b/Scintillator/ScintDetDescr/TriggerGeoModel/src/TriggerStation.cxx
@@ -60,7 +60,7 @@ TriggerStation::getParameters()
// m_length = m_plate->length() + m_safety; // veto
// pitch includes thickness of one plate
m_length = m_platePitchY + m_plate->length() + m_safety;
- m_thickness = (m_numPlates - 1) * m_platePitchZ + m_plate->thickness() + m_safety;
+ m_thickness = (m_numPlates - 1) * std::fabs(m_platePitchZ) + m_plate->thickness() + m_safety;
// Set numerology
m_detectorManager->numerology().setNumPlatesPerStation(m_numPlates);
@@ -82,16 +82,18 @@ TriggerStation::build(TriggerIdentifier id)
GeoFullPhysVol * station = new GeoFullPhysVol(m_logVolume);
- double activeDepth = m_thickness - m_safety/2;
+ double activeDepth = m_thickness - m_safety;
double plateThickness = m_plate->thickness();
for (int iPlate = 0; iPlate < m_numPlates; iPlate++)
{
station->add(new GeoNameTag("Plate#"+intToString(iPlate)));
station->add(new GeoIdentifierTag(iPlate));
id.setPlate(iPlate);
+ double zPlate = -((plateThickness - activeDepth)/2 + iPlate * m_platePitchZ);
+ std::cout << "zPlate = " << zPlate << std::endl;
GeoAlignableTransform* transform = new GeoAlignableTransform(GeoTrf::Translate3D(0.0,
-0.5*m_platePitchY + (iPlate%2) * m_platePitchY,
- (plateThickness - activeDepth)/2 + iPlate * m_platePitchZ));
+ zPlate));
station->add(transform);
GeoVPhysVol* platePV = m_plate->build(id);
station->add(platePV);
diff --git a/Scintillator/ScintDetDescr/VetoGeoModel/src/VetoStation.cxx b/Scintillator/ScintDetDescr/VetoGeoModel/src/VetoStation.cxx
index 0a969c4a9..7354aadd0 100644
--- a/Scintillator/ScintDetDescr/VetoGeoModel/src/VetoStation.cxx
+++ b/Scintillator/ScintDetDescr/VetoGeoModel/src/VetoStation.cxx
@@ -80,7 +80,7 @@ VetoStation::build(VetoIdentifier id)
GeoFullPhysVol * station = new GeoFullPhysVol(m_logVolume);
- double activeDepth = m_thickness - m_safety/2;
+ double activeDepth = m_thickness - m_safety;
double plateThickness = m_plate->thickness();
for (int iPlate = 0; iPlate < m_numPlates; iPlate++)
{
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.cxx
index 95caef05d..656369710 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.cxx
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_Barrel.cxx
@@ -71,7 +71,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_numLayers - 1) * std::fabs(m_phiStagger) + m_safety;
- m_thickness = m_plane->thickness() * m_numLayers + m_layerPitch * (m_numLayers - 1) + m_safety;
+ m_thickness = m_plane->thickness() + m_layerPitch * (m_numLayers - 1) + m_safety;
// Create the barrel volume
// Tube envelope containing the barrel.
@@ -86,7 +86,7 @@ SCT_Barrel::build(SCT_Identifier id)
GeoFullPhysVol * barrel = new GeoFullPhysVol(m_logVolume);
- double activeDepth = m_thickness - m_safety/2;
+ double activeDepth = m_thickness - m_safety;
double layerThickness = m_plane->thickness();
for (int iLayer = 0; iLayer < m_numLayers; iLayer++) {
--
GitLab