diff --git a/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql b/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql index d4f4890493841ab030f6570cecb52742fba53f69..173bfcce2acfd6f43a530b039dee125c47a27b95 100644 --- a/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql +++ b/DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql @@ -959,17 +959,24 @@ INSERT INTO "HVS_TAG2NODE" VALUES (9003, "Elements-00", 100008, NULL, 0, 0, 1549 INSERT INTO "HVS_TAG2NODE" VALUES (1, "Neutrino-00", 100031, NULL, 0, 0, 1582416000000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (1, "Neutrino-TB00", 107811, NULL, 0, 0, 1627862400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (1, "Neutrino-01", 107839, NULL, 0, 0, 1652054400000000000, NULL, 22); +INSERT INTO "HVS_TAG2NODE" VALUES (1, "Neutrino-02", 107895, NULL, 0, 0, 1696550400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (11,"Emulsion-00", 100034, NULL, 0, 0, 1582416000000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (11,"Emulsion-TB00", 107812, NULL, 0, 0, 1582416000000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (11,"Emulsion-01", 107840, NULL, 0, 0, 1652054400000000000, NULL, 22); +INSERT INTO "HVS_TAG2NODE" VALUES (11,"Emulsion-02", 107894, NULL, 0, 0, 1696550400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (110, "EmulsionTopLevel-00", 100035, NULL, 0, 0, 1582416000000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (110, "EmulsionTopLevel-TB00", 107813, NULL, 0, 0, 1627862400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (110, "EmulsionTopLevel-01", 107841, NULL, 0, 0, 1652054400000000000, NULL, 22); +INSERT INTO "HVS_TAG2NODE" VALUES (110, "EmulsionTopLevel-02", 107892, NULL, 0, 0, 1696550400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (111, "EmulsionGeneral-00", 107805, NULL, 0, 0, 1619308800000000000, NULL, 22); +INSERT INTO "HVS_TAG2NODE" VALUES (111, "EmulsionGeneral-01", 107891, NULL, 0, 0, 1696550400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (112, "EmulsionFilm-00", 107806, NULL, 0, 0, 1619308800000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (113, "EmulsionPlates-00", 107807, NULL, 0, 0, 1619308800000000000, NULL, 22); +INSERT INTO "HVS_TAG2NODE" VALUES (112, "EmulsionFilm-01", 107889, NULL, 0, 0, 1696550400000000000, NULL, 22); +INSERT INTO "HVS_TAG2NODE" VALUES (113, "EmulsionPlates-01", 107888, NULL, 0, 0, 1696550400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (114, "EmulsionSwitches-00", 100036, NULL, 0, 0, 1582416000000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (115, "EmulsionSupport-00", 107842, NULL, 0, 0, 1652054400000000000, NULL, 22); +INSERT INTO "HVS_TAG2NODE" VALUES (115, "EmulsionSupport-01", 107893, NULL, 0, 0, 1696550400000000000, 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 (2, "Scintillator-02", 107789, NULL, 0, 0, 1619222400000000000, NULL, 22); @@ -1079,12 +1086,10 @@ INSERT INTO "HVS_TAG2NODE" VALUES (235, "PreshowerRadatorGeneral-01", 107877, N INSERT INTO "HVS_TAG2NODE" VALUES (236, "PreshowerAbsorberGeneral-00", 107809, NULL, 0, 0, 1627776000000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (237, "PreshowerWrappingGeneral-00", 107875, NULL, 0, 0, 1685836800000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (237, "PreshowerWrappingGeneral-01", 107876, NULL, 0, 0, 1685836800000000000, NULL, 22); - INSERT INTO "HVS_TAG2NODE" VALUES (240, "VetoNuTopLevel-00", 107845, NULL, 0, 0, 1652054400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (241, "VetoNuStationGeneral-00", 107846, NULL, 0, 0, 1652054400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (242, "VetoNuPlateGeneral-00", 107847, NULL, 0, 0, 1652054400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (245, "VetoNuRadiatorGeneral-00", 107849, NULL, 0, 0, 1652054400000000000, 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); INSERT INTO "HVS_TAG2NODE" VALUES (2003, "ScintMaterials-00", 100011, NULL, 0, 0, 1549238400000000000, NULL, 22); @@ -1118,6 +1123,7 @@ INSERT INTO "HVS_TAG2NODE" VALUES (23, "Preshower-TB00", 107828, NULL, 0, 0, 162 INSERT INTO "HVS_TAG2NODE" VALUES (23, "Preshower-TB01", 107874, NULL, 0, 0, 1685836800000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (24, "VetoNu-00", 107844, NULL, 0, 0, 1652054400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (1005, "NeutrinoIdentifier-00", 100030, NULL, 0, 0, 1582416000000000000, NULL, 22); +INSERT INTO "HVS_TAG2NODE" VALUES (1005, "NeutrinoIdentifier-01", 107890, NULL, 0, 0, 1696550400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (2005, "ScintIdentifier-00", 100016, NULL, 0, 0, 1550448000000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (2005, "ScintIdentifier-TB00", 107832, NULL, 0, 0, 1627862400000000000, NULL, 22); INSERT INTO "HVS_TAG2NODE" VALUES (3005, "TrackerIdentifier-00", 100017, NULL, 0, 0, 1550448000000000000, NULL, 22); @@ -1981,14 +1987,14 @@ INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Materials", "Material INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "StdMaterials", "StdMaterials-00", 100006); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "StdMatComponents", "StdMatComponents-00", 100007); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Elements", "Elements-00", 100008); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Neutrino", "Neutrino-01", 107839); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Emulsion", "Emulsion-01", 107840); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionTopLevel", "EmulsionTopLevel-01", 107841); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionGeneral", "EmulsionGeneral-00", 107805); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionFilm", "EmulsionFilm-00", 107806); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionPlates", "EmulsionPlates-00", 107807); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Neutrino", "Neutrino-02", 107894); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Emulsion", "Emulsion-02", 107895); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionTopLevel", "EmulsionTopLevel-02", 107892); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionGeneral", "EmulsionGeneral-01", 107891); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionFilm", "EmulsionFilm-01", 107889); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionPlates", "EmulsionPlates-01", 107888); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionSwitches", "EmulsionSwitches-00", 100036); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionSupport", "EmulsionSupport-00", 107842); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "EmulsionSupport", "EmulsionSupport-01", 107893); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Scintillator", "Scintillator-04", 107861); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Tracker", "Tracker-04", 107882); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "SCT", "SCT-04", 107880); @@ -2049,7 +2055,7 @@ INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Veto", "Veto-04" INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Trigger", "Trigger-04", 107871); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "Preshower", "Preshower-04", 107873); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "VetoNu", "VetoNu-00", 107844); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "NeutrinoIdentifier", "NeutrinoIdentifier-00", 100030); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "NeutrinoIdentifier", "NeutrinoIdentifier-01", 107890); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "ScintIdentifier", "ScintIdentifier-00", 100016); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "TrackerIdentifier", "TrackerIdentifier-02", 107787); INSERT INTO "HVS_TAGCACHE" VALUES ("FASERNU-04", "CaloIdentifier", "CaloIdentifier-00", 100018); @@ -2060,12 +2066,12 @@ INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Materials", "Material INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "StdMaterials", "StdMaterials-00", 100006); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "StdMatComponents", "StdMatComponents-00", 100007); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Elements", "Elements-00", 100008); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Neutrino", "Neutrino-TB00", 107811); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Emulsion", "Emulsion-TB00", 107812); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "EmulsionTopLevel", "EmulsionTopLevel-TB00", 107813); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "EmulsionGeneral", "EmulsionGeneral-00", 107805); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "EmulsionFilm", "EmulsionFilm-00", 107806); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "EmulsionPlates", "EmulsionPlates-00", 107807); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Neutrino", "Neutrino-02", 107895); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Emulsion", "Emulsion-02", 107894); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "EmulsionTopLevel", "EmulsionTopLevel-02", 107892); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "EmulsionGeneral", "EmulsionGeneral-01", 107891); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "EmulsionFilm", "EmulsionFilm-01", 107889); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "EmulsionPlates", "EmulsionPlates-01", 107888); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "EmulsionSwitches", "EmulsionSwitches-00", 100036); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Scintillator", "Scintillator-TB01", 107862); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Tracker", "Tracker-TB01", 107883); @@ -2121,7 +2127,7 @@ INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "PreshowerSwitches", "Preshowe INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Veto", "Veto-TB01", 107866); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Trigger", "Trigger-TB01", 107872); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "Preshower", "Preshower-TB01", 107874); -INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "NeutrinoIdentifier", "NeutrinoIdentifier-00", 100030); +INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "NeutrinoIdentifier", "NeutrinoIdentifier-01", 107890); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "ScintIdentifier", "ScintIdentifier-TB00", 107832); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "TrackerIdentifier", "TrackerIdentifier-TB00", 107829); INSERT INTO "HVS_TAGCACHE" VALUES ("FASER-TB01", "CaloIdentifier", "CaloIdentifier-TB00", 107831); @@ -2670,30 +2676,46 @@ INSERT INTO "ELEMENTS_DATA2TAG" VALUES (100008, 91); INSERT INTO "EMULSIONTOPLEVEL_DATA" VALUES (0, 0.0, 0.0, -2475.72, 0.0, 0.0, 0.0, 321, "Emulsion"); INSERT INTO "EMULSIONTOPLEVEL_DATA" VALUES (1, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 321, "StationA"); INSERT INTO "EMULSIONTOPLEVEL_DATA" VALUES (2, 10.0, -21.0, -2510.27, 0.0, 0.0, 0.0, 321, "Emulsion"); +INSERT INTO "EMULSIONTOPLEVEL_DATA" VALUES (3, 10.0, -21.0, -2505.68, 0.0, 0.0, 0.0, 321, "Emulsion"); -- Actual box hardware is in same global position as previous INSERT INTO "EMULSIONTOPLEVEL_DATA2TAG" VALUES (100035, 0); INSERT INTO "EMULSIONTOPLEVEL_DATA2TAG" VALUES (100035, 1); INSERT INTO "EMULSIONTOPLEVEL_DATA2TAG" VALUES (107841, 2); INSERT INTO "EMULSIONTOPLEVEL_DATA2TAG" VALUES (107841, 1); +INSERT INTO "EMULSIONTOPLEVEL_DATA2TAG" VALUES (107892, 3); +INSERT INTO "EMULSIONTOPLEVEL_DATA2TAG" VALUES (107892, 1); -- -- INSERT INTO "EMULSIONGENERAL_DATA" VALUES (0, 35, 22, -524.275, 525.275); +INSERT INTO "EMULSIONGENERAL_DATA" VALUES (1, 73, 10, -519.598, 520.685); INSERT INTO "EMULSIONGENERAL_DATA2TAG" VALUES (107805, 0); +INSERT INTO "EMULSIONGENERAL_DATA2TAG" VALUES (107891, 1); -- -- INSERT INTO "EMULSIONSUPPORT_DATA" VALUES (0, "std::SSteel", 250.0, 300.0, 20.0, 0.0, 0.0, 535.45, "BoxBack"); INSERT INTO "EMULSIONSUPPORT_DATA" VALUES (1, "std::SSteel", 250.0, 300.0, 30.0, 0.0, 0.0, -540.45, "Pusher"); INSERT INTO "EMULSIONSUPPORT_DATA" VALUES (2, "std::SSteel", 250.0, 300.0, 20.0, 0.0, 0.0, -604.55, "BoxFront"); +INSERT INTO "EMULSIONSUPPORT_DATA" VALUES (3, "std::SSteel", 250.0, 300.0, 20.0, 0.0, 0.0, 530.855, "BoxBack"); +INSERT INTO "EMULSIONSUPPORT_DATA" VALUES (4, "std::SSteel", 250.0, 300.0, 30.0, 0.0, 0.0, -535.855, "Pusher"); +INSERT INTO "EMULSIONSUPPORT_DATA" VALUES (5, "std::SSteel", 250.0, 300.0, 20.0, 0.0, 0.0, -609.145, "BoxFront"); + INSERT INTO "EMULSIONSUPPORT_DATA2TAG" VALUES (107842, 0); INSERT INTO "EMULSIONSUPPORT_DATA2TAG" VALUES (107842, 1); INSERT INTO "EMULSIONSUPPORT_DATA2TAG" VALUES (107842, 2); +INSERT INTO "EMULSIONSUPPORT_DATA2TAG" VALUES (107893, 3); +INSERT INTO "EMULSIONSUPPORT_DATA2TAG" VALUES (107893, 4); +INSERT INTO "EMULSIONSUPPORT_DATA2TAG" VALUES (107893, 5); -- -- INSERT INTO "EMULSIONFILM_DATA" VALUES (0, 250.0, 300.0, 0.210, "neutrino::Polystyrene", 250.0, 300.0, 0.070, "neutrino::Emulsion"); +INSERT INTO "EMULSIONFILM_DATA" VALUES (1, 250.0, 300.0, 0.210, "neutrino::Polystyrene", 250.0, 300.0, 0.065, "neutrino::Emulsion"); INSERT INTO "EMULSIONFILM_DATA2TAG" VALUES (107806, 0); +INSERT INTO "EMULSIONFILM_DATA2TAG" VALUES (107889, 1); -- -- -INSERT INTO "EMULSIONPLATES_DATA" VALUES (0, 250.0, 300.0, 1050.9, 0.0, 0.0, 0.0, "std::Wolfram"); +INSERT INTO "EMULSIONPLATES_DATA" VALUES (0, 250.0, 300.0, 1050.9, 0.0, 0.0, 0.0, "std::Wolfram"); -- this is a slab of tungsten in which ALL base+film pieces are inserted +INSERT INTO "EMULSIONPLATES_DATA" VALUES (1, 250.0, 300.0, 1041.71, 0.0, 0.0, 0.0, "std::Wolfram"); INSERT INTO "EMULSIONPLATES_DATA2TAG" VALUES (107807, 0); +INSERT INTO "EMULSIONPLATES_DATA2TAG" VALUES (107888, 1); -- -- INSERT INTO "NEUTRINOMATERIALS_DATA" VALUES (0, "Polystyrene", 1.06); @@ -2902,7 +2924,7 @@ INSERT INTO "SCINTMATERIALS_DATA2TAG" VALUES (100011, 1); INSERT INTO "SCINTMATCOMPONENTS_DATA" VALUES (0, 0, "Carbon", 0.475); -- incorrect value used through FASERNU-03 and FASER-TB00 (through June 2023); molecular fractions were treated as mass fractions INSERT INTO "SCINTMATCOMPONENTS_DATA" VALUES (1, 0, "Hydrogen", 0.525); -- incorrect value used through FASERNU-03 and FASER-TB00 (through June 2023); molecular fractions were treated as mass fractions INSERT INTO "SCINTMATCOMPONENTS_DATA" VALUES (2, 1, "Carbon", 1.0); -INSERT INTO "SCINTMATCOMPONENTS_DATA" VALUES (3, 0, "Carbon", 0.915); -- correct mass fraction values used from FASERNU-04 and FASER-TB01 (through June 2023) +INSERT INTO "SCINTMATCOMPONENTS_DATA" VALUES (3, 0, "Carbon", 0.915); -- correct mass fraction values used from FASERNU-04 and FASER-TB01 (from June 2023) INSERT INTO "SCINTMATCOMPONENTS_DATA" VALUES (4, 0, "Hydrogen", 0.085); -- correct mass fraction values used from FASERNU-04 and FASER-TB01 (from June 2023) INSERT INTO "SCINTMATCOMPONENTS_DATA2TAG" VALUES (100012, 0); INSERT INTO "SCINTMATCOMPONENTS_DATA2TAG" VALUES (100012, 1); @@ -2947,7 +2969,9 @@ INSERT INTO "TRENCHSWITCHES_DATA2TAG" VALUES (107852, 0); -- -- INSERT INTO "NEUTRINOIDENTIFIER_DATA" VALUES (0, "Neutrino", "NeutrinoIdDictFiles/IdDictNeutrino.xml", "Baseline layout"); +INSERT INTO "NEUTRINOIDENTIFIER_DATA" VALUES (1, "Neutrino", "NeutrinoIdDictFiles/IdDictNeutrino_730.xml", "FaserNu-04 layout"); INSERT INTO "NEUTRINOIDENTIFIER_DATA2TAG" VALUES (100030, 0); +INSERT INTO "NEUTRINOIDENTIFIER_DATA2TAG" VALUES (107890, 1); -- -- INSERT INTO "SCINTIDENTIFIER_DATA" VALUES (0, "Scintillator", "ScintIdDictFiles/IdDictScintillator.xml", "Baseline layout"); diff --git a/Neutrino/NeutrinoDetDescr/NeutrinoIdDictFiles/data/IdDictNeutrino_730.xml b/Neutrino/NeutrinoDetDescr/NeutrinoIdDictFiles/data/IdDictNeutrino_730.xml new file mode 100644 index 0000000000000000000000000000000000000000..3aeca47b4aa0b8a04291f8a8a8deda462654900b --- /dev/null +++ b/Neutrino/NeutrinoDetDescr/NeutrinoIdDictFiles/data/IdDictNeutrino_730.xml @@ -0,0 +1,19 @@ +<IdDictionary name="Neutrino"> + + <field name="part"> + <label name="Emulsion" value="1" /> + </field> + + <field name="film"> + <label name="Upstream" value="0" /> + <label name="Downstream" value="1" /> + </field> + + <region> + <range field="part" value="Emulsion" /> + <range field="module" minvalue="0" maxvalue="72" /> + <range field="base" minvalue="0" maxvalue="9" /> + <range field="film" values="Upstream Downstream" /> + </region> + +</IdDictionary> \ No newline at end of file diff --git a/Neutrino/NeutrinoDetDescr/NeutrinoIdentifier/NeutrinoIdentifier/EmulsionID.h b/Neutrino/NeutrinoDetDescr/NeutrinoIdentifier/NeutrinoIdentifier/EmulsionID.h index 9e396dd788940c30b3daaeb904134ecab7e04e88..ec1ee50213f23d2d0d3022e6f08561df0d1a45c4 100644 --- a/Neutrino/NeutrinoDetDescr/NeutrinoIdentifier/NeutrinoIdentifier/EmulsionID.h +++ b/Neutrino/NeutrinoDetDescr/NeutrinoIdentifier/NeutrinoIdentifier/EmulsionID.h @@ -53,8 +53,8 @@ class IdDictDictionary; ** element range meaning ** ------- ----- ------- ** - ** module 0 to 34 35 modules - ** base 0 to 21 22 bases per module + ** module 0 to 72 73 modules + ** base 0 to 9 10 bases per module ** film side 0 to 1 2 films per base ** ** @endverbatim @@ -527,8 +527,8 @@ inline int EmulsionID::base_bit ( void ) const { int base = static_cast<int>(m_film_impl.shift()); // lowest field base - return (base > 32) ? 32 : base; - // max base is 32 so we can still read old strip id's and differences + return (base > 9) ? 9 : base; + // max base is 9 so we can still read old strip id's and differences // from non-SLHC releases. } diff --git a/Neutrino/NeutrinoSimEvent/src/NeutrinoHitIdHelper.cxx b/Neutrino/NeutrinoSimEvent/src/NeutrinoHitIdHelper.cxx index 8b60d732871df6fb37eef94d305640622a93d0ae..59999048b4c8008cbd3b4f38e7bb9982d3ef0b31 100644 --- a/Neutrino/NeutrinoSimEvent/src/NeutrinoHitIdHelper.cxx +++ b/Neutrino/NeutrinoSimEvent/src/NeutrinoHitIdHelper.cxx @@ -48,8 +48,8 @@ void NeutrinoHitIdHelper::Initialize() { if (detStore->retrieve(pix, "EmulsionID").isFailure()) { pix = 0; } } - InitializeField("Module", 0, 34); - InitializeField("Base", 0, 21); + InitializeField("Module", 0, 72); + InitializeField("Base", 0, 9); InitializeField("Film", 0, 1); }