diff --git a/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql b/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql index 035bb19b37f0f2d84cf6b95cfc84b1762fce9613..61ddbac550b693c1d5c814f1e4a1862c4f57b516 100644 --- a/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql +++ b/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql @@ -581,6 +581,7 @@ INSERT INTO "HVS_NODE" VALUES (4005, "CaloIdentifier", 4, 0, NULL); -- Command to get midnight of current date in UT: -- date -u --date '00:00 today' +%s INSERT INTO "HVS_TAG2NODE" VALUES (0, "FASER-00", 100000, NULL, 0, 0, 1549238400000000000, NULL, 22); +INSERT INTO "HVS_TAG2NODE" VALUES (0, "FASER-01", 100039, NULL, 0, 0, 1590796800000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (90, "FaserCommon-00", 100013, NULL, 0, 0, 1549324800000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (9000, "Materials-00", 100005, NULL, 0, 0, 1549238400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (9001, "StdMaterials-00", 100006, NULL, 0, 0, 1549238400000000000, NULL, 22); @@ -592,12 +593,16 @@ INSERT INTO "HVS_TAG2NODE" VALUES (110, "EmulsionTopLevel-00", 100035, NULL, 0, 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 (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); +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 (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); INSERT INTO "HVS_TAG2NODE" VALUES (312, "SctBarrelSensor-00", 106730, NULL, 0, 0, 1567987200000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (313, "SctFaserGeneral-00", 106789, NULL, 0, 0, 1567987200000000000, NULL, 22); +INSERT INTO "HVS_TAG2NODE" VALUES (313, "SctFaserGeneral-01", 106791, NULL, 0, 0, 1567987200000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (314, "SctSwitches-00", 107782, NULL, 0, 0, 1567987200000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (315, "SctMaterials-00", 107777, NULL, 0, 0, 1567987200000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (316, "SctMatComponents-00", 107778, NULL, 0, 0, 1567987200000000000, NULL, 22); @@ -635,9 +640,13 @@ INSERT INTO "HVS_TAG2NODE" VALUES (3005, "TrackerIdentifier-00", 100017, NULL, 0 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, 100000, 3, 100002); +INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100039, 3, 100038); INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100000, 4, 100003); +INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100039, 4, 100003); INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100000, 9000, 100005); +INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100039, 9000, 100005); INSERT INTO "HVS_LTAG2LTAG" VALUES (9000, 100005, 9001, 100006); INSERT INTO "HVS_LTAG2LTAG" VALUES (9000, 100005, 9002, 100007); INSERT INTO "HVS_LTAG2LTAG" VALUES (9000, 100005, 9003, 100008); @@ -659,8 +668,12 @@ INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100001, 2003, 100011); INSERT INTO "HVS_LTAG2LTAG" VALUES (2, 100001, 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); +INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100038, 3004, 100022); INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100002, 31, 100026); +INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100038, 31, 100037); INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100026, 310, 106788); +INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100037, 310, 106790); INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100026, 311, 107003); INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100026, 312, 106730); INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100026, 313, 106789); @@ -668,13 +681,22 @@ INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100026, 314, 107782); INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100026, 315, 107777); INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100026, 316, 107778); INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100026, 317, 107779); +INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100037, 311, 107003); +INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100037, 312, 106730); +INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100037, 313, 106791); +INSERT INTO "HVS_LTAG2LTAG" VALUES (31, 100037, 314, 107782); +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 (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 (4, 100003, 4003, 100023); INSERT INTO "HVS_LTAG2LTAG" VALUES (4, 100003, 4004, 100024); INSERT INTO "HVS_LTAG2LTAG" VALUES (0, 100000, 90, 100013); +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); @@ -684,6 +706,7 @@ INSERT INTO "HVS_LTAG2LTAG" VALUES (23, 120015, 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 (3, 100002, 3005, 100017); +INSERT INTO "HVS_LTAG2LTAG" VALUES (3, 100038, 3005, 100017); INSERT INTO "HVS_LTAG2LTAG" VALUES (4, 100003, 4005, 100018); -- Data for the HVS_TAGCACHE table INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-00", "FASER", "FASER-00", 100000); @@ -739,6 +762,60 @@ INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-00", "NeutrinoIdentifier", "NeutrinoId INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-00", "ScintIdentifier", "ScintIdentifier-00", 100016); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-00", "TrackerIdentifier", "TrackerIdentifier-00", 100017); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-00", "CaloIdentifier", "CaloIdentifier-00", 100018); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "FASER", "FASER-01", 100039); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "FaserCommon", "FaserCommon-00", 100013); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Materials", "Materials-00", 100005); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "StdMaterials", "StdMaterials-00", 100006); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "StdMatComponents", "StdMatComponents-00", 100007); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Elements", "Elements-00", 100008); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "Neutrino", "Neutrino-00", 100031); +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", "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); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "SctBrlModule", "SCTBrlModule-00", 107003); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "SctBrlSensor", "SCTBrlSensor-00", 106730); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "SctFaserGeneral", "SCTFaserGeneral-01", 106791); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "SctSwitches", "SCTSwitches-00", 107782); +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", "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", "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", "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); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "ScintMaterials", "ScintMaterials-00", 100011); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "ScintMatComponents", "ScintMatComponents-00", 100012); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "TrackerMaterials", "TrackerMaterials-00", 100021); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "TrackerMatComponents", "TrackerMatComponents-00", 100022); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "CaloMaterials", "CaloMaterials-00", 100023); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "CaloMatComponents", "CaloMatComponents-00", 100024); +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", "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); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-01", "CaloIdentifier", "CaloIdentifier-00", 100018); + -- -- -- Part 2b: Content (Leaf node) data @@ -1394,20 +1471,31 @@ INSERT INTO "SCTTOPLEVEL_DATA" VALUES(0,0.0,0.0,-1200.0,0.0,0.0,0.0,312,'Station INSERT INTO "SCTTOPLEVEL_DATA" VALUES(1,0.0,0.0, 0.0,0.0,0.0,0.0,312,'StationB'); INSERT INTO "SCTTOPLEVEL_DATA" VALUES(2,0.0,0.0, 1200.0,0.0,0.0,0.0,312,'StationC'); INSERT INTO "SCTTOPLEVEL_DATA" VALUES(3,0.0,0.0, 1290.0,0.0,0.0,0.0,312,'SCT'); +INSERT INTO "SCTTOPLEVEL_DATA" VALUES(4,0.0,0.0,-1190.0,0.0,0.0,0.0,312,'StationA'); +INSERT INTO "SCTTOPLEVEL_DATA" VALUES(5,0.0,0.0, 0.0,0.0,0.0,0.0,312,'StationB'); +INSERT INTO "SCTTOPLEVEL_DATA" VALUES(6,0.0,0.0, 1190.0,0.0,0.0,0.0,312,'StationC'); +INSERT INTO "SCTTOPLEVEL_DATA" VALUES(7,0.0,0.0, 1237.7075,0.0,0.0,0.0,312,'SCT'); + DROP TABLE IF EXISTS "SCTTOPLEVEL_DATA2TAG"; CREATE TABLE "SCTTOPLEVEL_DATA2TAG" ( "SCTTOPLEVEL_TAG_ID" SLONGLONG ,"SCTTOPLEVEL_DATA_ID" SLONGLONG ); INSERT INTO "SCTTOPLEVEL_DATA2TAG" VALUES(106788,0); INSERT INTO "SCTTOPLEVEL_DATA2TAG" VALUES(106788,1); INSERT INTO "SCTTOPLEVEL_DATA2TAG" VALUES(106788,2); INSERT INTO "SCTTOPLEVEL_DATA2TAG" VALUES(106788,3); +INSERT INTO "SCTTOPLEVEL_DATA2TAG" VALUES(106790,4); +INSERT INTO "SCTTOPLEVEL_DATA2TAG" VALUES(106790,5); +INSERT INTO "SCTTOPLEVEL_DATA2TAG" VALUES(106790,6); +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, UNIQUE ( "SCTFASERGENERAL_DATA_ID") ); -INSERT INTO "SCTFASERGENERAL_DATA" VALUES (0, 3, 65.0, 60.0, 30.0, 2.5, 5.0); +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); 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); +INSERT INTO "SCTFASERGENERAL_DATA2TAG" VALUES(106791, 1); -- -- DROP TABLE IF EXISTS "SCTSWITCHES_DATA"; diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BarrelParameters.h b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BarrelParameters.h index 9005a5a20d496808cb95cdfd75183ef966d45379..eefed7554bf7dc010e8e9185a23c05fd3bc00260 100644 --- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BarrelParameters.h +++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/SCT_BarrelParameters.h @@ -16,14 +16,17 @@ public: // Constructor SCT_BarrelParameters(SCT_DataBase* rdb); + // Barrel General + double etaHalfPitch() const; double phiHalfPitch() const; double depthHalfPitch() const; double sideHalfPitch() const; - // Barrel General int numLayers() const; double layerPitch() const; + double phiStagger() const; + private: SCT_DataBase * m_rdb; diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelParameters.cxx b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelParameters.cxx index 749a239be75b577b442ea62d5d9c01f01183e0ce..cb48aed9ead807cba70fb655f152c54647d56541 100644 --- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelParameters.cxx +++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/src/SCT_BarrelParameters.cxx @@ -47,6 +47,12 @@ SCT_BarrelParameters::SCT_BarrelParameters(SCT_DataBase* rdb) return m_rdb->brlGeneral()->getDouble("SIDEHALFPITCH"); } + double + SCT_BarrelParameters::phiStagger() const + { + return m_rdb->brlGeneral()->getDouble("PHISTAGGER"); + } + // // Barrel General //