|
1616 | 1616 | muonDict = {
|
1617 | 1617 | "abbrev" : "M",
|
1618 | 1618 | "name" : "muon",
|
1619 |
| - "default" : 4, |
| 1619 | + "default" : 8, |
1620 | 1620 | "M1" : {
|
1621 | 1621 | 1 : [
|
1622 | 1622 | 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml',
|
|
1797 | 1797 | ],
|
1798 | 1798 | "era" : "run3_GEM",
|
1799 | 1799 | },
|
| 1800 | + "M5" : { |
| 1801 | + 1 : [ |
| 1802 | + 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', |
| 1803 | + 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', |
| 1804 | + 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', |
| 1805 | + 'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml', |
| 1806 | + 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', |
| 1807 | + 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', |
| 1808 | + 'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml', |
| 1809 | + 'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml', |
| 1810 | + 'Geometry/MuonCommonData/data/rpcf/2021/v4/rpcf.xml', |
| 1811 | + 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', |
| 1812 | + 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', |
| 1813 | + 'Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml', |
| 1814 | + 'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml', |
| 1815 | + 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', |
| 1816 | + ], |
| 1817 | + 2 : [ |
| 1818 | + 'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml', |
| 1819 | + ], |
| 1820 | + 3 : [ |
| 1821 | + 'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml', |
| 1822 | + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml', |
| 1823 | + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', |
| 1824 | + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', |
| 1825 | + 'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml', |
| 1826 | + 'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml', |
| 1827 | + 'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml', |
| 1828 | + ], |
| 1829 | + 4 : [ |
| 1830 | + 'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml', |
| 1831 | + ], |
| 1832 | + "sim" : [ |
| 1833 | + 'from Geometry.MuonNumbering.muonGeometryConstants_cff import *', |
| 1834 | + 'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *', |
| 1835 | + ], |
| 1836 | + "reco" : [ |
| 1837 | + 'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *', |
| 1838 | + 'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *', |
| 1839 | + 'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *', |
| 1840 | + 'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *', |
| 1841 | + 'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *', |
| 1842 | + ], |
| 1843 | + "era" : "run3_GEM", |
| 1844 | + }, |
| 1845 | + "M6" : { |
| 1846 | + 1 : [ |
| 1847 | + 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', |
| 1848 | + 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', |
| 1849 | + 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', |
| 1850 | + 'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml', |
| 1851 | + 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', |
| 1852 | + 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', |
| 1853 | + 'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml', |
| 1854 | + 'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml', |
| 1855 | + 'Geometry/MuonCommonData/data/rpcf/2021/v4/rpcf.xml', |
| 1856 | + 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', |
| 1857 | + 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', |
| 1858 | + 'Geometry/MuonCommonData/data/gem21/2023/v2/gem21.xml', |
| 1859 | + 'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml', |
| 1860 | + 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', |
| 1861 | + ], |
| 1862 | + 2 : [ |
| 1863 | + 'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml', |
| 1864 | + ], |
| 1865 | + 3 : [ |
| 1866 | + 'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml', |
| 1867 | + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml', |
| 1868 | + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', |
| 1869 | + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', |
| 1870 | + 'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml', |
| 1871 | + 'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml', |
| 1872 | + 'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml', |
| 1873 | + ], |
| 1874 | + 4 : [ |
| 1875 | + 'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml', |
| 1876 | + ], |
| 1877 | + "sim" : [ |
| 1878 | + 'from Geometry.MuonNumbering.muonGeometryConstants_cff import *', |
| 1879 | + 'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *', |
| 1880 | + ], |
| 1881 | + "reco" : [ |
| 1882 | + 'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *', |
| 1883 | + 'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *', |
| 1884 | + 'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *', |
| 1885 | + 'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *', |
| 1886 | + 'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *', |
| 1887 | + ], |
| 1888 | + "era" : "run3_GEM", |
| 1889 | + }, |
| 1890 | + "M7" : { |
| 1891 | + 1 : [ |
| 1892 | + 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', |
| 1893 | + 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', |
| 1894 | + 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', |
| 1895 | + 'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml', |
| 1896 | + 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', |
| 1897 | + 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', |
| 1898 | + 'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml', |
| 1899 | + 'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml', |
| 1900 | + 'Geometry/MuonCommonData/data/rpcf/2024/v3/rpcf.xml', |
| 1901 | + 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', |
| 1902 | + 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', |
| 1903 | + 'Geometry/MuonCommonData/data/gem21/2024/v2/gem21.xml', |
| 1904 | + 'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml', |
| 1905 | + 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', |
| 1906 | + ], |
| 1907 | + 2 : [ |
| 1908 | + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', |
| 1909 | + ], |
| 1910 | + 3 : [ |
| 1911 | + 'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml', |
| 1912 | + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml', |
| 1913 | + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', |
| 1914 | + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', |
| 1915 | + 'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml', |
| 1916 | + 'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml', |
| 1917 | + 'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml', |
| 1918 | + ], |
| 1919 | + 4 : [ |
| 1920 | + 'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml', |
| 1921 | + ], |
| 1922 | + "sim" : [ |
| 1923 | + 'from Geometry.MuonNumbering.muonGeometryConstants_cff import *', |
| 1924 | + 'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *', |
| 1925 | + ], |
| 1926 | + "reco" : [ |
| 1927 | + 'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *', |
| 1928 | + 'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *', |
| 1929 | + 'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *', |
| 1930 | + 'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *', |
| 1931 | + 'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *', |
| 1932 | + ], |
| 1933 | + "era" : "run3_GEM", |
| 1934 | + }, |
| 1935 | + "M8" : { |
| 1936 | + 1 : [ |
| 1937 | + 'Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml', |
| 1938 | + 'Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml', |
| 1939 | + 'Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml', |
| 1940 | + 'Geometry/MuonCommonData/data/mb3/2021/v1/mb3.xml', |
| 1941 | + 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', |
| 1942 | + 'Geometry/MuonCommonData/data/mb4Shield/2021/v2/mb4Shield.xml', |
| 1943 | + 'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml', |
| 1944 | + 'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml', |
| 1945 | + 'Geometry/MuonCommonData/data/rpcf/2025/v1/rpcf.xml', |
| 1946 | + 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', |
| 1947 | + 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', |
| 1948 | + 'Geometry/MuonCommonData/data/gem21/2025/v2/gem21.xml', |
| 1949 | + 'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml', |
| 1950 | + 'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml', |
| 1951 | + ], |
| 1952 | + 2 : [ |
| 1953 | + 'Geometry/MuonCommonData/data/muonNumbering/2024/v1/muonNumbering.xml', |
| 1954 | + ], |
| 1955 | + 3 : [ |
| 1956 | + 'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml', |
| 1957 | + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml', |
| 1958 | + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', |
| 1959 | + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', |
| 1960 | + 'Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml', |
| 1961 | + 'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml', |
| 1962 | + 'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml', |
| 1963 | + ], |
| 1964 | + 4 : [ |
| 1965 | + 'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml', |
| 1966 | + ], |
| 1967 | + "sim" : [ |
| 1968 | + 'from Geometry.MuonNumbering.muonGeometryConstants_cff import *', |
| 1969 | + 'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *', |
| 1970 | + ], |
| 1971 | + "reco" : [ |
| 1972 | + 'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *', |
| 1973 | + 'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *', |
| 1974 | + 'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *', |
| 1975 | + 'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *', |
| 1976 | + 'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *', |
| 1977 | + ], |
| 1978 | + "era" : "run3_GEM", |
| 1979 | + }, |
1800 | 1980 | }
|
1801 | 1981 |
|
1802 | 1982 | forwardDict = {
|
|
2011 | 2191 | allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, ppsDict ]
|
2012 | 2192 |
|
2013 | 2193 | detectorVersionDict = {
|
2014 |
| - ("O6","T3","C3","M1","F1","P7") : "2021", |
2015 |
| - ("O4","T4","C1","M1","F1","P7") : "2021ZeroMaterial", |
2016 |
| - ("O5","T5","C1","M1","F1","P7") : "2021FlatMinus05Percent", |
2017 |
| - ("O5","T6","C1","M1","F1","P7") : "2021FlatMinus10Percent", |
2018 |
| - ("O5","T7","C1","M1","F1","P7") : "2021FlatPlus05Percent", |
2019 |
| - ("O5","T8","C1","M1","F1","P7") : "2021FlatPlus10Percent", |
2020 |
| - ("O6","T3","C2","M2","F3","P7") : "2023", |
2021 |
| - ("O4","T4","C1","M2","F2","P7") : "2023ZeroMaterial", |
2022 |
| - ("O5","T5","C1","M2","F2","P7") : "2023FlatMinus05Percent", |
2023 |
| - ("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent", |
2024 |
| - ("O5","T7","C1","M2","F2","P7") : "2023FlatPlus05Percent", |
2025 |
| - ("O5","T8","C1","M2","F2","P7") : "2023FlatPlus10Percent", |
2026 |
| - ("O6","T3","C2","M3","F3","P7") : "2024", |
2027 |
| - ("O4","T4","C2","M3","F2","P7") : "2024ZeroMaterial", |
2028 |
| - ("O5","T5","C2","M3","F2","P7") : "2024FlatMinus05Percent", |
2029 |
| - ("O5","T6","C2","M3","F2","P7") : "2024FlatMinus10Percent", |
2030 |
| - ("O5","T7","C2","M3","F2","P7") : "2024FlatPlus05Percent", |
2031 |
| - ("O5","T8","C2","M3","F2","P7") : "2024FlatPlus10Percent", |
2032 |
| - ("O7","T3","C2","M4","F3","P7") : "2025", |
2033 |
| - ("O8","T4","C2","M4","F3","P7") : "2025ZeroMaterial", |
2034 |
| - ("O9","T5","C2","M4","F3","P7") : "2025FlatMinus05Percent", |
2035 |
| - ("O9","T6","C2","M4","F3","P7") : "2025FlatMinus10Percent", |
2036 |
| - ("O9","T7","C2","M4","F3","P7") : "2025FlatPlus05Percent", |
2037 |
| - ("O9","T8","C2","M4","F3","P7") : "2025FlatPlus10Percent", |
| 2194 | + ("O6","T3","C3","M5","F1","P7") : "2021", |
| 2195 | + ("O4","T4","C1","M5","F1","P7") : "2021ZeroMaterial", |
| 2196 | + ("O5","T5","C1","M5","F1","P7") : "2021FlatMinus05Percent", |
| 2197 | + ("O5","T6","C1","M5","F1","P7") : "2021FlatMinus10Percent", |
| 2198 | + ("O5","T7","C1","M5","F1","P7") : "2021FlatPlus05Percent", |
| 2199 | + ("O5","T8","C1","M5","F1","P7") : "2021FlatPlus10Percent", |
| 2200 | + ("O6","T3","C2","M6","F3","P7") : "2023", |
| 2201 | + ("O4","T4","C1","M6","F2","P7") : "2023ZeroMaterial", |
| 2202 | + ("O5","T5","C1","M6","F2","P7") : "2023FlatMinus05Percent", |
| 2203 | + ("O5","T6","C1","M6","F2","P7") : "2023FlatMinus10Percent", |
| 2204 | + ("O5","T7","C1","M6","F2","P7") : "2023FlatPlus05Percent", |
| 2205 | + ("O5","T8","C1","M6","F2","P7") : "2023FlatPlus10Percent", |
| 2206 | + ("O6","T3","C2","M7","F3","P7") : "2024", |
| 2207 | + ("O4","T4","C2","M7","F2","P7") : "2024ZeroMaterial", |
| 2208 | + ("O5","T5","C2","M7","F2","P7") : "2024FlatMinus05Percent", |
| 2209 | + ("O5","T6","C2","M7","F2","P7") : "2024FlatMinus10Percent", |
| 2210 | + ("O5","T7","C2","M7","F2","P7") : "2024FlatPlus05Percent", |
| 2211 | + ("O5","T8","C2","M7","F2","P7") : "2024FlatPlus10Percent", |
| 2212 | + ("O7","T3","C2","M8","F3","P7") : "2025", |
| 2213 | + ("O8","T4","C2","M8","F3","P7") : "2025ZeroMaterial", |
| 2214 | + ("O9","T5","C2","M8","F3","P7") : "2025FlatMinus05Percent", |
| 2215 | + ("O9","T6","C2","M8","F3","P7") : "2025FlatMinus10Percent", |
| 2216 | + ("O9","T7","C2","M8","F3","P7") : "2025FlatPlus05Percent", |
| 2217 | + ("O9","T8","C2","M8","F3","P7") : "2025FlatPlus10Percent", |
2038 | 2218 | }
|
2039 | 2219 |
|
2040 |
| -deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3", |
2041 |
| - "P4", "P5", "P6" ]) |
| 2220 | +deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "M1" "M2", "M3", "M4", |
| 2221 | + "P1", "P2", "P3", "P4", "P5", "P6" ]) |
0 commit comments