diff --git a/Detector/Rich1/include/Detector/Rich1/RichMatPropData.h b/Detector/Rich1/include/Detector/Rich1/RichMatPropData.h
index 5d1873891c1f82267865adb7a354a1f3fb550900..c92513e8e1a7848b3f5ec207ca77fdeabebe5bbd 100644
--- a/Detector/Rich1/include/Detector/Rich1/RichMatPropData.h
+++ b/Detector/Rich1/include/Detector/Rich1/RichMatPropData.h
@@ -41,9 +41,11 @@ public:
if ( gName == Rich::Nitrogen ) {
refTemperature = detail::dd4hep_param<double>( "Rich1NitrogenTemperature" );
} else if ( gName == Rich::C4F10 ) {
- refTemperature = detail::dd4hep_param<double>( "C4F10ReferenceTemperature" );
+ // refTemperature = detail::dd4hep_param<double>( "C4F10ReferenceTemperature" );
+ refTemperature = detail::dd4hep_param<double>( "C4F10Temperature" );
} else if ( gName == Rich::CF4 ) {
- refTemperature = detail::dd4hep_param<double>( "CF4ReferenceTemperatureForSellmeirClassic" );
+ // refTemperature = detail::dd4hep_param<double>( "CF4ReferenceTemperatureForSellmeirClassic" );
+ refTemperature = detail::dd4hep_param<double>( "CF4Temperature" );
}
return refTemperature;
}
@@ -54,7 +56,8 @@ public:
if ( gName == Rich::Nitrogen ) {
refPressure = detail::dd4hep_param<double>( "Rich1NitrogenPressure" );
} else if ( gName == Rich::C4F10 ) {
- refPressure = detail::dd4hep_param<double>( "C4F10ReferencePressure" );
+ // refPressure = detail::dd4hep_param<double>( "C4F10ReferencePressure" );
+ refPressure = detail::dd4hep_param<double>( "C4F10Pressure" );
} else if ( gName == Rich::CF4 ) {
refPressure = detail::dd4hep_param<double>( "CF4Pressure" );
}
diff --git a/Detector/Rich1/src/RichDescUtilSrc/RichMatPropData.cpp b/Detector/Rich1/src/RichDescUtilSrc/RichMatPropData.cpp
index 38e10b636c8896b185b33ef5cba4a2fa3ddb9c37..75688c7800a18475eabd987425884b951ca0a0a5 100644
--- a/Detector/Rich1/src/RichDescUtilSrc/RichMatPropData.cpp
+++ b/Detector/Rich1/src/RichDescUtilSrc/RichMatPropData.cpp
@@ -215,6 +215,9 @@ RichMatPropData::CreateRefIndxTable( const Rich::RadiatorType gName, //
const double aTemperature, //
const double aScaleFactor ) const {
+ dd4hep::printout( dd4hep::DEBUG, "CreateRefIndxTable", "GasType=%i CurPres=%f CurTemp=%f", (int)gName, aPressure,
+ aTemperature );
+
const auto ueV = 1.0 * dd4hep::eV;
const auto aSellLorGasFac = detail::dd4hep_param<double>( "SellLorGasFac" );
diff --git a/compact/components/Materials/trunk/RichRun3PropertySpecParam.xml b/compact/components/Materials/trunk/RichRun3PropertySpecParam.xml
index 257fac608f06e0f72006ea3140981c68727cdc2b..5b2246447e1a979e2889cc7601a3a2279af01de4 100644
--- a/compact/components/Materials/trunk/RichRun3PropertySpecParam.xml
+++ b/compact/components/Materials/trunk/RichRun3PropertySpecParam.xml
@@ -18,27 +18,26 @@
<constant name="AtmospherePressure" value="1.013*bar"/>
<constant name="AtmosphereTemperature" value="293.0*kelvin"/>
-
-<constant name="RhPmtMaxQuantumEff" value="0.60" />
-<constant name="RhMapmtMaxQuantumEff" value="0.6" />
+<!-- The following two values modified on Feb13-2025 to be close to max of recently measured values -->
+<constant name="RhPmtMaxQuantumEff" value="0.50" />
+<constant name="RhMapmtMaxQuantumEff" value="0.5" />
<constant name="Rh1Mirror1MaxReflectivity" value="0.95" />
<constant name="Rh1Mirror2MaxReflectivity" value="0.95" />
<constant name="Rh2Mirror1MaxReflectivity" value="0.95" />
<constant name="Rh2Mirror2MaxReflectivity" value="0.95" />
-<!-- The following line moved to RichRun3GeneralGeomParam.xml -->
-<!-- <constant name="RhZBeyondDownstreamOfRich1" value="3000.0*mm" /> -->
<constant name="RichPhotMomWaveCnv" value="1243.125" />
<constant name="STP_Temperature" value="273.*kelvin" />
<constant name="STP_Pressure" value="1.01325*bar" />
<constant name="SellLorGasFac" value="0.3738" />
-<constant name="C4F10Temperature" value="293.*kelvin" />
+<constant name="C4F10Temperature" value="295.0083728641*kelvin" />
+<!-- Changed to the value above on Feb13-2025 to match default in CondDB for C4F10 -->
<constant name="C4F10ReferenceTemperature" value="293.*kelvin" />
<constant name="C4F10ReferencePressure" value="STP_Pressure" />
-<constant name="C4F10Pressure" value="1.013*bar" />
-<!-- <constant name="C4F10ReferencePressure" value= "C4F10Pressure" /> -->
+<constant name="C4F10Pressure" value="0.96549918675473*bar" />
+<!-- Changed to the value above on Feb13-2025 to match default in CondDB for C4F10 -->
<constant name="C4F10Density" value="0.01195" unit="g/cm3" />
<constant name="C4F10GasRhoFac" value="(C4F10Pressure/STP_Pressure)*(STP_Temperature/C4F10Temperature)" />
<constant name="HeraBC4F10A" value="1.0013178"/>
@@ -51,8 +50,9 @@
<constant name="GasMolWeightC4F10" value="138.0" />
<constant name="RhoEffectiveSellC4F10" value="0.00964" />
<constant name="Rich1NitrogenDensity" value="0.0008073" unit="g/cm3" />
-<constant name="Rich1NitrogenTemperature" value="293.*kelvin" />
-<constant name="Rich1NitrogenPressure" value="1.013*bar" />
+<constant name="Rich1NitrogenTemperature" value="295.0083728641*kelvin" />
+<constant name="Rich1NitrogenPressure" value="0.96549918675473*bar" />
+<!-- The two lines above changed to the values above on Feb13-2025 to match default in CondDB for C4F10 -->
<constant name="SellN2E1" value="13.414" />
<constant name="SellN2E2" value="23.215" />
<constant name="SellN2F1" value="921.28" />
@@ -60,10 +60,12 @@
<constant name="GasMolWeightN2" value="28.02" />
<constant name="GasRhoN2atSTP" value="0.00125053" />
<constant name="N2GasRhoCur" value="GasRhoN2atSTP*(Rich1NitrogenPressure/STP_Pressure)*(STP_Temperature/Rich1NitrogenTemperature)"/>
-<constant name="CF4Temperature" value="293.*kelvin" />
+<constant name="CF4Temperature" value="294.03354768216*kelvin" />
+<!-- The line above changed to the value above on Feb13-2025 to match default in CondDB for CF4 -->
<constant name="CF4ReferenceTemperatureForSellmeirClassic" value="293.*kelvin" />
<constant name="CF4ReferenceTemperatureForSellmeirAbjean" value="273.*kelvin" />
-<constant name="CF4Pressure" value="1.013*bar" />
+<constant name="CF4Pressure" value="0.96470168675473*bar" />
+<!-- The line above changed to the value above on Feb13-2025 to match default in CondDB for CF4 -->
<constant name="CF4Density" value="0.003884" unit="g/cm3"/>
<constant name="SellCF4E1" value="20.003" />
<constant name="SellCF4E2" value="50.0" />
@@ -89,8 +91,10 @@
<constant name="CO2SellmeirMultFacotor" value="0.000001" />
<constant name="CO2SellmeirLambdaZeroFactor" value="79.9406" />
<constant name="CO2ReferenceTemperature" value="273.0" />
-<constant name="RichCO2Temperature" value="293.*kelvin" />
-<constant name="RichCO2Pressure" value="1.013*bar" />
+<constant name="RichCO2Temperature" value="294.03354768216*kelvin" />
+<constant name="RichCO2Pressure" value="0.96470168675473*bar" />
+<!-- The two lines above changed to the values above on Feb13-2025 to match default in CondDB for CF4 -->
+
<!--
diff --git a/compact/components/Rich/2024-v00.00/Rich1/DetElem/RichRun3PropertySpecParam.xml b/compact/components/Rich/2024-v00.00/Rich1/DetElem/RichRun3PropertySpecParam.xml
deleted file mode 100644
index 257fac608f06e0f72006ea3140981c68727cdc2b..0000000000000000000000000000000000000000
--- a/compact/components/Rich/2024-v00.00/Rich1/DetElem/RichRun3PropertySpecParam.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<!--===========================================================================-->
-<!-- LHCb Detector material Description -->
-<!--===========================================================================-->
-<!-- -->
-<!-- Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!-- All rights reserved. -->
-<!-- -->
-<!-- @author S.Easo -->
-<!-- @date 02/07/2020 -->
-<!-- -->
-<!--===========================================================================-->
-<!-- Rich detector property specifications parameters definitions -->
-<!--===========================================================================-->
-<lccdd>
-
- <define>
-
-<constant name="AtmospherePressure" value="1.013*bar"/>
-<constant name="AtmosphereTemperature" value="293.0*kelvin"/>
-
-
-<constant name="RhPmtMaxQuantumEff" value="0.60" />
-<constant name="RhMapmtMaxQuantumEff" value="0.6" />
-<constant name="Rh1Mirror1MaxReflectivity" value="0.95" />
-<constant name="Rh1Mirror2MaxReflectivity" value="0.95" />
-<constant name="Rh2Mirror1MaxReflectivity" value="0.95" />
-<constant name="Rh2Mirror2MaxReflectivity" value="0.95" />
-
-<!-- The following line moved to RichRun3GeneralGeomParam.xml -->
-<!-- <constant name="RhZBeyondDownstreamOfRich1" value="3000.0*mm" /> -->
-
-
-<constant name="RichPhotMomWaveCnv" value="1243.125" />
-<constant name="STP_Temperature" value="273.*kelvin" />
-<constant name="STP_Pressure" value="1.01325*bar" />
-<constant name="SellLorGasFac" value="0.3738" />
-<constant name="C4F10Temperature" value="293.*kelvin" />
-<constant name="C4F10ReferenceTemperature" value="293.*kelvin" />
-<constant name="C4F10ReferencePressure" value="STP_Pressure" />
-<constant name="C4F10Pressure" value="1.013*bar" />
-<!-- <constant name="C4F10ReferencePressure" value= "C4F10Pressure" /> -->
-<constant name="C4F10Density" value="0.01195" unit="g/cm3" />
-<constant name="C4F10GasRhoFac" value="(C4F10Pressure/STP_Pressure)*(STP_Temperature/C4F10Temperature)" />
-<constant name="HeraBC4F10A" value="1.0013178"/>
-<constant name="HeraBC4F10B" value="1.723E-7" />
-<constant name="HeraBC4F10C" value="5.495E-6" />
-<constant name="SellC4F10E1" value="18.938" />
-<constant name="SellC4F10E2" value="50.0" />
-<constant name="SellC4F10F1" value="12305.3" />
-<constant name="SellC4F10F2" value="0.0" />
-<constant name="GasMolWeightC4F10" value="138.0" />
-<constant name="RhoEffectiveSellC4F10" value="0.00964" />
-<constant name="Rich1NitrogenDensity" value="0.0008073" unit="g/cm3" />
-<constant name="Rich1NitrogenTemperature" value="293.*kelvin" />
-<constant name="Rich1NitrogenPressure" value="1.013*bar" />
-<constant name="SellN2E1" value="13.414" />
-<constant name="SellN2E2" value="23.215" />
-<constant name="SellN2F1" value="921.28" />
-<constant name="SellN2F2" value="3569.60" />
-<constant name="GasMolWeightN2" value="28.02" />
-<constant name="GasRhoN2atSTP" value="0.00125053" />
-<constant name="N2GasRhoCur" value="GasRhoN2atSTP*(Rich1NitrogenPressure/STP_Pressure)*(STP_Temperature/Rich1NitrogenTemperature)"/>
-<constant name="CF4Temperature" value="293.*kelvin" />
-<constant name="CF4ReferenceTemperatureForSellmeirClassic" value="293.*kelvin" />
-<constant name="CF4ReferenceTemperatureForSellmeirAbjean" value="273.*kelvin" />
-<constant name="CF4Pressure" value="1.013*bar" />
-<constant name="CF4Density" value="0.003884" unit="g/cm3"/>
-<constant name="SellCF4E1" value="20.003" />
-<constant name="SellCF4E2" value="50.0" />
-<constant name="SellCF4F1" value="7626.16" />
-<constant name="SellCF4F2" value="0.0" />
-<constant name="GasMolWeightCF4" value="88" />
-<constant name="GasRhoCF4atSTP" value="0.00366" />
-<constant name="GasRhoCF4atSellClassicReference" value="0.00366" />
-<constant name="C3F8Temperature" value="293.*kelvin" />
-<constant name="C3F8ReferenceTemperature" value="STP_Temperature" />
-<constant name="C3F8Pressure" value="1.013*bar" />
-<constant name="C3F8ReferencePressure" value="STP_Pressure" />
-<constant name="C3F8Density" value="0.0080306" unit="g/cm3" />
-<constant name="GasMolWeightC3F8" value = "188.02" />
-<constant name="C3F8RhoAtSTP" value= "C3F8Density" />
-<constant name="C3F8GasRhoCur" value="(C3F8Pressure/STP_Pressure)*(STP_Temperature/C3F8Temperature)" />
-<constant name="C3F8SellMeirAFactor" value="0.279337" />
-<constant name="C3F8SellMeirAMultFact" value="0.000001" />
-<constant name="C3F8SellmeirLambdaZeroFactorInNanometer" value="64.434073096" />
-<constant name="C3F8SellmeirEphyZeroFactor" value ="RichPhotMomWaveCnv/C3F8SellmeirLambdaZeroFactorInNanometer" />
-<constant name="C3F8SellmeirEphyZeroSquaredFactor" value="C3F8SellmeirEphyZeroFactor*C3F8SellmeirEphyZeroFactor" />
-<constant name="CO2SellmeirAFactor" value ="0.0689781" />
-<constant name="CO2SellmeirMultFacotor" value="0.000001" />
-<constant name="CO2SellmeirLambdaZeroFactor" value="79.9406" />
-<constant name="CO2ReferenceTemperature" value="273.0" />
-<constant name="RichCO2Temperature" value="293.*kelvin" />
-<constant name="RichCO2Pressure" value="1.013*bar" />
-
-<!--
-
- For C3F8 the Sellmeir param obtained from NIMA 381 (1996) 576-577 and converted to
- the formula in photon energy. SE March 18-2010
-
- parameter name="CF4GasRhoCur" value="GasRhoCF4atSTP*(CF4Pressure/STP_Pressure)*(STP_Temperature/CF4Temperature)"
-
- The following modif is to be compatible with cdf paramtrization.
- May2010- The sellmeir for CF4 is at the reference pressure of 1013 mbar and 293 K .
-
- So the label for density is adjusted to reflect this.
-
- In the above the parameter GasRhoCF4atSTP is kept for backward compatibility, although the
- density is that at 1013bar and 293K and not at STP. To avoid confusion a new
- parameter is introduced, namely GasRhoCF4atSellClassicReference.
--->
-
-<constant name="CF4GasRhoCur" value="GasRhoCF4atSellClassicReference" />
-
-
-<!--
- Also for CF4 the second parametrization added; this is at 1013 mbar and 273K. This is
- now used as default. Ref: Abjean etal. NIMA 292 (1990) 593-594.
- Now for the second parametrization of CF4 refractive index in June-7-2010.
- The parameter 0.000261154 from this reference is converted as 1/sqrt(0.000261154)=61.880192909 to
- get the lambdazero parameter.
-
--->
-
-<constant name="CF4SellMeirAFactor" value="0.124523" />
-<constant name="CF4SellMeirAMultFact" value="0.000001" />
-<constant name="CF4SellmeirLambdaZeroFactorInNanometer" value="61.880192909" />
-<constant name="CF4SellmeirEphyZeroFactor" value ="RichPhotMomWaveCnv/CF4SellmeirLambdaZeroFactorInNanometer" />
-<constant name="CF4SellmeirEphyZeroSquaredFactor" value="CF4SellmeirEphyZeroFactor*CF4SellmeirEphyZeroFactor" />
-
-
-
-<constant name="Rich2NitrogenDensity" value="0.0008073" unit="g/cm3" />
-<constant name="Rich2NitrogenTemperature" value="293.*kelvin" />
-<constant name="Rich2NitrogenPressure" value="1.013*bar" />
-
-
-<!-- now for the photon energy ranges c4f10-->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyC4F10" value="1.6*eV" />
-<constant name="PhotonMaxEnergyC4F10" value="6.5*eV" />
-<constant name="PhotonCkvMinEnergyC4F10" value="1.6*eV" />
-<constant name="PhotonCkvMaxEnergyC4F10" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyC4F10" value="1.5*eV" />
-<constant name="PhotonMaxEnergyC4F10" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyC4F10" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyC4F10" value="7.0*eV" />
--->
-<!-- now for the photon energy ranges cf4 -->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyCF4" value="1.6*eV" />
-<constant name="PhotonMaxEnergyCF4" value="6.5*eV" />
-<constant name="PhotonCkvMinEnergyCF4" value="1.6*eV" />
-<constant name="PhotonCkvMaxEnergyCF4" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyCF4" value="1.5*eV" />
-<constant name="PhotonMaxEnergyCF4" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyCF4" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyCF4" value="7.0*eV" />
--->
-<!-- now for the photon energy ranges anywhere in RICH , for example in Hpd -->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyInRICH" value="1.6*eV" />
-<constant name="PhotonMaxEnergyInRICH" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyInRICH" value="1.5*eV" />
-<constant name="PhotonMaxEnergyInRICH" value="7.5*eV" />
--->
-<!-- Now for CF4 Scintillation -->
-<constant name = "CF4ScintillationFastTimeConstantInNanoSec" value="10.0" />
-<constant name = "CF4ScintillationYieldPerMeV" value="2000.0" />
-<constant name = "CF4ScintillationResolutionScale" value="1.0" />
-
-
-<!-- End of the RichPropertySpecification Parameters -->
-<constant name="PMTSiHitDetectionEff" value="0.90" />
-
-<!-- The following param is used only in Brunel -->
-<constant name="PMTQuartzWindowEfficiency" value="0.92" />
-
-
-<!-- Aerogel optical parameters kept for special studies although not used in RUN3 -->
-<constant name="AgelMeasuredClarity" value="0.006" />
-<constant name="AgelDefaultClarity" value="0.006" />
-<constant name="Rich1AerogelSurfScatConstA" value="0.9368" />
-<!-- now for the photon energy ranges Aerogel-->
-<constant name="SellAgelE1" value="10.666" />
-<constant name="SellAgelE2" value="18.125" />
-<constant name="SellAgelF1" value="2.653" />
-<constant name="SellAgelF2" value="13.075" />
-
-<constant name="PhotonMinEnergyAerogel" value="1.5*eV" />
-<constant name="PhotonMaxEnergyAerogel" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyAerogel" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyAerogel" value="4.5*eV" />
-
-
-<constant name="AerogelThickness" value="50.0*mm" />
-<constant name="AgelfixedLambdaValue" value="632.8*nanometer" />
-
-<!-- End of Aerogel parameters for special studies -->
-
-
-
-<!-- The following kept for any special studies although not part of standard RUN3 -->
-<!-- HPD related parameters for special studies and potential backward compatibility -->
-<constant name="RhHpdMaxQuantumEff" value="0.45" />
-<constant name="HPDSiHitDetectionEff" value="0.85" />
-<!-- The following parameter is used in Brunel only -->
-<constant name="HPDQuartzWindowEfficiency" value="0.92" />
-
-<!-- End of HPD related parameters for special studies -->
-
-<!-- The following used until the Rich1 QW AR coating is implemented propertly in boundary proc in Gauss -->
-<constant name="Rich1GasQWARCoatingEfficiencyFactor" value="1.0308" />
-
-
-<!-- End of Rich detector property specifications parameters definitions -->
-
- </define>
-
-</lccdd>
diff --git a/compact/components/Rich/2025-v00.00/Rich1/DetElem/RichRun3PropertySpecParam.xml b/compact/components/Rich/2025-v00.00/Rich1/DetElem/RichRun3PropertySpecParam.xml
deleted file mode 100644
index 257fac608f06e0f72006ea3140981c68727cdc2b..0000000000000000000000000000000000000000
--- a/compact/components/Rich/2025-v00.00/Rich1/DetElem/RichRun3PropertySpecParam.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<!--===========================================================================-->
-<!-- LHCb Detector material Description -->
-<!--===========================================================================-->
-<!-- -->
-<!-- Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!-- All rights reserved. -->
-<!-- -->
-<!-- @author S.Easo -->
-<!-- @date 02/07/2020 -->
-<!-- -->
-<!--===========================================================================-->
-<!-- Rich detector property specifications parameters definitions -->
-<!--===========================================================================-->
-<lccdd>
-
- <define>
-
-<constant name="AtmospherePressure" value="1.013*bar"/>
-<constant name="AtmosphereTemperature" value="293.0*kelvin"/>
-
-
-<constant name="RhPmtMaxQuantumEff" value="0.60" />
-<constant name="RhMapmtMaxQuantumEff" value="0.6" />
-<constant name="Rh1Mirror1MaxReflectivity" value="0.95" />
-<constant name="Rh1Mirror2MaxReflectivity" value="0.95" />
-<constant name="Rh2Mirror1MaxReflectivity" value="0.95" />
-<constant name="Rh2Mirror2MaxReflectivity" value="0.95" />
-
-<!-- The following line moved to RichRun3GeneralGeomParam.xml -->
-<!-- <constant name="RhZBeyondDownstreamOfRich1" value="3000.0*mm" /> -->
-
-
-<constant name="RichPhotMomWaveCnv" value="1243.125" />
-<constant name="STP_Temperature" value="273.*kelvin" />
-<constant name="STP_Pressure" value="1.01325*bar" />
-<constant name="SellLorGasFac" value="0.3738" />
-<constant name="C4F10Temperature" value="293.*kelvin" />
-<constant name="C4F10ReferenceTemperature" value="293.*kelvin" />
-<constant name="C4F10ReferencePressure" value="STP_Pressure" />
-<constant name="C4F10Pressure" value="1.013*bar" />
-<!-- <constant name="C4F10ReferencePressure" value= "C4F10Pressure" /> -->
-<constant name="C4F10Density" value="0.01195" unit="g/cm3" />
-<constant name="C4F10GasRhoFac" value="(C4F10Pressure/STP_Pressure)*(STP_Temperature/C4F10Temperature)" />
-<constant name="HeraBC4F10A" value="1.0013178"/>
-<constant name="HeraBC4F10B" value="1.723E-7" />
-<constant name="HeraBC4F10C" value="5.495E-6" />
-<constant name="SellC4F10E1" value="18.938" />
-<constant name="SellC4F10E2" value="50.0" />
-<constant name="SellC4F10F1" value="12305.3" />
-<constant name="SellC4F10F2" value="0.0" />
-<constant name="GasMolWeightC4F10" value="138.0" />
-<constant name="RhoEffectiveSellC4F10" value="0.00964" />
-<constant name="Rich1NitrogenDensity" value="0.0008073" unit="g/cm3" />
-<constant name="Rich1NitrogenTemperature" value="293.*kelvin" />
-<constant name="Rich1NitrogenPressure" value="1.013*bar" />
-<constant name="SellN2E1" value="13.414" />
-<constant name="SellN2E2" value="23.215" />
-<constant name="SellN2F1" value="921.28" />
-<constant name="SellN2F2" value="3569.60" />
-<constant name="GasMolWeightN2" value="28.02" />
-<constant name="GasRhoN2atSTP" value="0.00125053" />
-<constant name="N2GasRhoCur" value="GasRhoN2atSTP*(Rich1NitrogenPressure/STP_Pressure)*(STP_Temperature/Rich1NitrogenTemperature)"/>
-<constant name="CF4Temperature" value="293.*kelvin" />
-<constant name="CF4ReferenceTemperatureForSellmeirClassic" value="293.*kelvin" />
-<constant name="CF4ReferenceTemperatureForSellmeirAbjean" value="273.*kelvin" />
-<constant name="CF4Pressure" value="1.013*bar" />
-<constant name="CF4Density" value="0.003884" unit="g/cm3"/>
-<constant name="SellCF4E1" value="20.003" />
-<constant name="SellCF4E2" value="50.0" />
-<constant name="SellCF4F1" value="7626.16" />
-<constant name="SellCF4F2" value="0.0" />
-<constant name="GasMolWeightCF4" value="88" />
-<constant name="GasRhoCF4atSTP" value="0.00366" />
-<constant name="GasRhoCF4atSellClassicReference" value="0.00366" />
-<constant name="C3F8Temperature" value="293.*kelvin" />
-<constant name="C3F8ReferenceTemperature" value="STP_Temperature" />
-<constant name="C3F8Pressure" value="1.013*bar" />
-<constant name="C3F8ReferencePressure" value="STP_Pressure" />
-<constant name="C3F8Density" value="0.0080306" unit="g/cm3" />
-<constant name="GasMolWeightC3F8" value = "188.02" />
-<constant name="C3F8RhoAtSTP" value= "C3F8Density" />
-<constant name="C3F8GasRhoCur" value="(C3F8Pressure/STP_Pressure)*(STP_Temperature/C3F8Temperature)" />
-<constant name="C3F8SellMeirAFactor" value="0.279337" />
-<constant name="C3F8SellMeirAMultFact" value="0.000001" />
-<constant name="C3F8SellmeirLambdaZeroFactorInNanometer" value="64.434073096" />
-<constant name="C3F8SellmeirEphyZeroFactor" value ="RichPhotMomWaveCnv/C3F8SellmeirLambdaZeroFactorInNanometer" />
-<constant name="C3F8SellmeirEphyZeroSquaredFactor" value="C3F8SellmeirEphyZeroFactor*C3F8SellmeirEphyZeroFactor" />
-<constant name="CO2SellmeirAFactor" value ="0.0689781" />
-<constant name="CO2SellmeirMultFacotor" value="0.000001" />
-<constant name="CO2SellmeirLambdaZeroFactor" value="79.9406" />
-<constant name="CO2ReferenceTemperature" value="273.0" />
-<constant name="RichCO2Temperature" value="293.*kelvin" />
-<constant name="RichCO2Pressure" value="1.013*bar" />
-
-<!--
-
- For C3F8 the Sellmeir param obtained from NIMA 381 (1996) 576-577 and converted to
- the formula in photon energy. SE March 18-2010
-
- parameter name="CF4GasRhoCur" value="GasRhoCF4atSTP*(CF4Pressure/STP_Pressure)*(STP_Temperature/CF4Temperature)"
-
- The following modif is to be compatible with cdf paramtrization.
- May2010- The sellmeir for CF4 is at the reference pressure of 1013 mbar and 293 K .
-
- So the label for density is adjusted to reflect this.
-
- In the above the parameter GasRhoCF4atSTP is kept for backward compatibility, although the
- density is that at 1013bar and 293K and not at STP. To avoid confusion a new
- parameter is introduced, namely GasRhoCF4atSellClassicReference.
--->
-
-<constant name="CF4GasRhoCur" value="GasRhoCF4atSellClassicReference" />
-
-
-<!--
- Also for CF4 the second parametrization added; this is at 1013 mbar and 273K. This is
- now used as default. Ref: Abjean etal. NIMA 292 (1990) 593-594.
- Now for the second parametrization of CF4 refractive index in June-7-2010.
- The parameter 0.000261154 from this reference is converted as 1/sqrt(0.000261154)=61.880192909 to
- get the lambdazero parameter.
-
--->
-
-<constant name="CF4SellMeirAFactor" value="0.124523" />
-<constant name="CF4SellMeirAMultFact" value="0.000001" />
-<constant name="CF4SellmeirLambdaZeroFactorInNanometer" value="61.880192909" />
-<constant name="CF4SellmeirEphyZeroFactor" value ="RichPhotMomWaveCnv/CF4SellmeirLambdaZeroFactorInNanometer" />
-<constant name="CF4SellmeirEphyZeroSquaredFactor" value="CF4SellmeirEphyZeroFactor*CF4SellmeirEphyZeroFactor" />
-
-
-
-<constant name="Rich2NitrogenDensity" value="0.0008073" unit="g/cm3" />
-<constant name="Rich2NitrogenTemperature" value="293.*kelvin" />
-<constant name="Rich2NitrogenPressure" value="1.013*bar" />
-
-
-<!-- now for the photon energy ranges c4f10-->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyC4F10" value="1.6*eV" />
-<constant name="PhotonMaxEnergyC4F10" value="6.5*eV" />
-<constant name="PhotonCkvMinEnergyC4F10" value="1.6*eV" />
-<constant name="PhotonCkvMaxEnergyC4F10" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyC4F10" value="1.5*eV" />
-<constant name="PhotonMaxEnergyC4F10" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyC4F10" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyC4F10" value="7.0*eV" />
--->
-<!-- now for the photon energy ranges cf4 -->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyCF4" value="1.6*eV" />
-<constant name="PhotonMaxEnergyCF4" value="6.5*eV" />
-<constant name="PhotonCkvMinEnergyCF4" value="1.6*eV" />
-<constant name="PhotonCkvMaxEnergyCF4" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyCF4" value="1.5*eV" />
-<constant name="PhotonMaxEnergyCF4" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyCF4" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyCF4" value="7.0*eV" />
--->
-<!-- now for the photon energy ranges anywhere in RICH , for example in Hpd -->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyInRICH" value="1.6*eV" />
-<constant name="PhotonMaxEnergyInRICH" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyInRICH" value="1.5*eV" />
-<constant name="PhotonMaxEnergyInRICH" value="7.5*eV" />
--->
-<!-- Now for CF4 Scintillation -->
-<constant name = "CF4ScintillationFastTimeConstantInNanoSec" value="10.0" />
-<constant name = "CF4ScintillationYieldPerMeV" value="2000.0" />
-<constant name = "CF4ScintillationResolutionScale" value="1.0" />
-
-
-<!-- End of the RichPropertySpecification Parameters -->
-<constant name="PMTSiHitDetectionEff" value="0.90" />
-
-<!-- The following param is used only in Brunel -->
-<constant name="PMTQuartzWindowEfficiency" value="0.92" />
-
-
-<!-- Aerogel optical parameters kept for special studies although not used in RUN3 -->
-<constant name="AgelMeasuredClarity" value="0.006" />
-<constant name="AgelDefaultClarity" value="0.006" />
-<constant name="Rich1AerogelSurfScatConstA" value="0.9368" />
-<!-- now for the photon energy ranges Aerogel-->
-<constant name="SellAgelE1" value="10.666" />
-<constant name="SellAgelE2" value="18.125" />
-<constant name="SellAgelF1" value="2.653" />
-<constant name="SellAgelF2" value="13.075" />
-
-<constant name="PhotonMinEnergyAerogel" value="1.5*eV" />
-<constant name="PhotonMaxEnergyAerogel" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyAerogel" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyAerogel" value="4.5*eV" />
-
-
-<constant name="AerogelThickness" value="50.0*mm" />
-<constant name="AgelfixedLambdaValue" value="632.8*nanometer" />
-
-<!-- End of Aerogel parameters for special studies -->
-
-
-
-<!-- The following kept for any special studies although not part of standard RUN3 -->
-<!-- HPD related parameters for special studies and potential backward compatibility -->
-<constant name="RhHpdMaxQuantumEff" value="0.45" />
-<constant name="HPDSiHitDetectionEff" value="0.85" />
-<!-- The following parameter is used in Brunel only -->
-<constant name="HPDQuartzWindowEfficiency" value="0.92" />
-
-<!-- End of HPD related parameters for special studies -->
-
-<!-- The following used until the Rich1 QW AR coating is implemented propertly in boundary proc in Gauss -->
-<constant name="Rich1GasQWARCoatingEfficiencyFactor" value="1.0308" />
-
-
-<!-- End of Rich detector property specifications parameters definitions -->
-
- </define>
-
-</lccdd>
diff --git a/compact/components/Rich/before-rich1-geom-update-26052022/Rich1/DetElem/RichRun3PropertySpecParam.xml b/compact/components/Rich/before-rich1-geom-update-26052022/Rich1/DetElem/RichRun3PropertySpecParam.xml
deleted file mode 100644
index 257fac608f06e0f72006ea3140981c68727cdc2b..0000000000000000000000000000000000000000
--- a/compact/components/Rich/before-rich1-geom-update-26052022/Rich1/DetElem/RichRun3PropertySpecParam.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<!--===========================================================================-->
-<!-- LHCb Detector material Description -->
-<!--===========================================================================-->
-<!-- -->
-<!-- Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!-- All rights reserved. -->
-<!-- -->
-<!-- @author S.Easo -->
-<!-- @date 02/07/2020 -->
-<!-- -->
-<!--===========================================================================-->
-<!-- Rich detector property specifications parameters definitions -->
-<!--===========================================================================-->
-<lccdd>
-
- <define>
-
-<constant name="AtmospherePressure" value="1.013*bar"/>
-<constant name="AtmosphereTemperature" value="293.0*kelvin"/>
-
-
-<constant name="RhPmtMaxQuantumEff" value="0.60" />
-<constant name="RhMapmtMaxQuantumEff" value="0.6" />
-<constant name="Rh1Mirror1MaxReflectivity" value="0.95" />
-<constant name="Rh1Mirror2MaxReflectivity" value="0.95" />
-<constant name="Rh2Mirror1MaxReflectivity" value="0.95" />
-<constant name="Rh2Mirror2MaxReflectivity" value="0.95" />
-
-<!-- The following line moved to RichRun3GeneralGeomParam.xml -->
-<!-- <constant name="RhZBeyondDownstreamOfRich1" value="3000.0*mm" /> -->
-
-
-<constant name="RichPhotMomWaveCnv" value="1243.125" />
-<constant name="STP_Temperature" value="273.*kelvin" />
-<constant name="STP_Pressure" value="1.01325*bar" />
-<constant name="SellLorGasFac" value="0.3738" />
-<constant name="C4F10Temperature" value="293.*kelvin" />
-<constant name="C4F10ReferenceTemperature" value="293.*kelvin" />
-<constant name="C4F10ReferencePressure" value="STP_Pressure" />
-<constant name="C4F10Pressure" value="1.013*bar" />
-<!-- <constant name="C4F10ReferencePressure" value= "C4F10Pressure" /> -->
-<constant name="C4F10Density" value="0.01195" unit="g/cm3" />
-<constant name="C4F10GasRhoFac" value="(C4F10Pressure/STP_Pressure)*(STP_Temperature/C4F10Temperature)" />
-<constant name="HeraBC4F10A" value="1.0013178"/>
-<constant name="HeraBC4F10B" value="1.723E-7" />
-<constant name="HeraBC4F10C" value="5.495E-6" />
-<constant name="SellC4F10E1" value="18.938" />
-<constant name="SellC4F10E2" value="50.0" />
-<constant name="SellC4F10F1" value="12305.3" />
-<constant name="SellC4F10F2" value="0.0" />
-<constant name="GasMolWeightC4F10" value="138.0" />
-<constant name="RhoEffectiveSellC4F10" value="0.00964" />
-<constant name="Rich1NitrogenDensity" value="0.0008073" unit="g/cm3" />
-<constant name="Rich1NitrogenTemperature" value="293.*kelvin" />
-<constant name="Rich1NitrogenPressure" value="1.013*bar" />
-<constant name="SellN2E1" value="13.414" />
-<constant name="SellN2E2" value="23.215" />
-<constant name="SellN2F1" value="921.28" />
-<constant name="SellN2F2" value="3569.60" />
-<constant name="GasMolWeightN2" value="28.02" />
-<constant name="GasRhoN2atSTP" value="0.00125053" />
-<constant name="N2GasRhoCur" value="GasRhoN2atSTP*(Rich1NitrogenPressure/STP_Pressure)*(STP_Temperature/Rich1NitrogenTemperature)"/>
-<constant name="CF4Temperature" value="293.*kelvin" />
-<constant name="CF4ReferenceTemperatureForSellmeirClassic" value="293.*kelvin" />
-<constant name="CF4ReferenceTemperatureForSellmeirAbjean" value="273.*kelvin" />
-<constant name="CF4Pressure" value="1.013*bar" />
-<constant name="CF4Density" value="0.003884" unit="g/cm3"/>
-<constant name="SellCF4E1" value="20.003" />
-<constant name="SellCF4E2" value="50.0" />
-<constant name="SellCF4F1" value="7626.16" />
-<constant name="SellCF4F2" value="0.0" />
-<constant name="GasMolWeightCF4" value="88" />
-<constant name="GasRhoCF4atSTP" value="0.00366" />
-<constant name="GasRhoCF4atSellClassicReference" value="0.00366" />
-<constant name="C3F8Temperature" value="293.*kelvin" />
-<constant name="C3F8ReferenceTemperature" value="STP_Temperature" />
-<constant name="C3F8Pressure" value="1.013*bar" />
-<constant name="C3F8ReferencePressure" value="STP_Pressure" />
-<constant name="C3F8Density" value="0.0080306" unit="g/cm3" />
-<constant name="GasMolWeightC3F8" value = "188.02" />
-<constant name="C3F8RhoAtSTP" value= "C3F8Density" />
-<constant name="C3F8GasRhoCur" value="(C3F8Pressure/STP_Pressure)*(STP_Temperature/C3F8Temperature)" />
-<constant name="C3F8SellMeirAFactor" value="0.279337" />
-<constant name="C3F8SellMeirAMultFact" value="0.000001" />
-<constant name="C3F8SellmeirLambdaZeroFactorInNanometer" value="64.434073096" />
-<constant name="C3F8SellmeirEphyZeroFactor" value ="RichPhotMomWaveCnv/C3F8SellmeirLambdaZeroFactorInNanometer" />
-<constant name="C3F8SellmeirEphyZeroSquaredFactor" value="C3F8SellmeirEphyZeroFactor*C3F8SellmeirEphyZeroFactor" />
-<constant name="CO2SellmeirAFactor" value ="0.0689781" />
-<constant name="CO2SellmeirMultFacotor" value="0.000001" />
-<constant name="CO2SellmeirLambdaZeroFactor" value="79.9406" />
-<constant name="CO2ReferenceTemperature" value="273.0" />
-<constant name="RichCO2Temperature" value="293.*kelvin" />
-<constant name="RichCO2Pressure" value="1.013*bar" />
-
-<!--
-
- For C3F8 the Sellmeir param obtained from NIMA 381 (1996) 576-577 and converted to
- the formula in photon energy. SE March 18-2010
-
- parameter name="CF4GasRhoCur" value="GasRhoCF4atSTP*(CF4Pressure/STP_Pressure)*(STP_Temperature/CF4Temperature)"
-
- The following modif is to be compatible with cdf paramtrization.
- May2010- The sellmeir for CF4 is at the reference pressure of 1013 mbar and 293 K .
-
- So the label for density is adjusted to reflect this.
-
- In the above the parameter GasRhoCF4atSTP is kept for backward compatibility, although the
- density is that at 1013bar and 293K and not at STP. To avoid confusion a new
- parameter is introduced, namely GasRhoCF4atSellClassicReference.
--->
-
-<constant name="CF4GasRhoCur" value="GasRhoCF4atSellClassicReference" />
-
-
-<!--
- Also for CF4 the second parametrization added; this is at 1013 mbar and 273K. This is
- now used as default. Ref: Abjean etal. NIMA 292 (1990) 593-594.
- Now for the second parametrization of CF4 refractive index in June-7-2010.
- The parameter 0.000261154 from this reference is converted as 1/sqrt(0.000261154)=61.880192909 to
- get the lambdazero parameter.
-
--->
-
-<constant name="CF4SellMeirAFactor" value="0.124523" />
-<constant name="CF4SellMeirAMultFact" value="0.000001" />
-<constant name="CF4SellmeirLambdaZeroFactorInNanometer" value="61.880192909" />
-<constant name="CF4SellmeirEphyZeroFactor" value ="RichPhotMomWaveCnv/CF4SellmeirLambdaZeroFactorInNanometer" />
-<constant name="CF4SellmeirEphyZeroSquaredFactor" value="CF4SellmeirEphyZeroFactor*CF4SellmeirEphyZeroFactor" />
-
-
-
-<constant name="Rich2NitrogenDensity" value="0.0008073" unit="g/cm3" />
-<constant name="Rich2NitrogenTemperature" value="293.*kelvin" />
-<constant name="Rich2NitrogenPressure" value="1.013*bar" />
-
-
-<!-- now for the photon energy ranges c4f10-->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyC4F10" value="1.6*eV" />
-<constant name="PhotonMaxEnergyC4F10" value="6.5*eV" />
-<constant name="PhotonCkvMinEnergyC4F10" value="1.6*eV" />
-<constant name="PhotonCkvMaxEnergyC4F10" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyC4F10" value="1.5*eV" />
-<constant name="PhotonMaxEnergyC4F10" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyC4F10" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyC4F10" value="7.0*eV" />
--->
-<!-- now for the photon energy ranges cf4 -->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyCF4" value="1.6*eV" />
-<constant name="PhotonMaxEnergyCF4" value="6.5*eV" />
-<constant name="PhotonCkvMinEnergyCF4" value="1.6*eV" />
-<constant name="PhotonCkvMaxEnergyCF4" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyCF4" value="1.5*eV" />
-<constant name="PhotonMaxEnergyCF4" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyCF4" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyCF4" value="7.0*eV" />
--->
-<!-- now for the photon energy ranges anywhere in RICH , for example in Hpd -->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyInRICH" value="1.6*eV" />
-<constant name="PhotonMaxEnergyInRICH" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyInRICH" value="1.5*eV" />
-<constant name="PhotonMaxEnergyInRICH" value="7.5*eV" />
--->
-<!-- Now for CF4 Scintillation -->
-<constant name = "CF4ScintillationFastTimeConstantInNanoSec" value="10.0" />
-<constant name = "CF4ScintillationYieldPerMeV" value="2000.0" />
-<constant name = "CF4ScintillationResolutionScale" value="1.0" />
-
-
-<!-- End of the RichPropertySpecification Parameters -->
-<constant name="PMTSiHitDetectionEff" value="0.90" />
-
-<!-- The following param is used only in Brunel -->
-<constant name="PMTQuartzWindowEfficiency" value="0.92" />
-
-
-<!-- Aerogel optical parameters kept for special studies although not used in RUN3 -->
-<constant name="AgelMeasuredClarity" value="0.006" />
-<constant name="AgelDefaultClarity" value="0.006" />
-<constant name="Rich1AerogelSurfScatConstA" value="0.9368" />
-<!-- now for the photon energy ranges Aerogel-->
-<constant name="SellAgelE1" value="10.666" />
-<constant name="SellAgelE2" value="18.125" />
-<constant name="SellAgelF1" value="2.653" />
-<constant name="SellAgelF2" value="13.075" />
-
-<constant name="PhotonMinEnergyAerogel" value="1.5*eV" />
-<constant name="PhotonMaxEnergyAerogel" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyAerogel" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyAerogel" value="4.5*eV" />
-
-
-<constant name="AerogelThickness" value="50.0*mm" />
-<constant name="AgelfixedLambdaValue" value="632.8*nanometer" />
-
-<!-- End of Aerogel parameters for special studies -->
-
-
-
-<!-- The following kept for any special studies although not part of standard RUN3 -->
-<!-- HPD related parameters for special studies and potential backward compatibility -->
-<constant name="RhHpdMaxQuantumEff" value="0.45" />
-<constant name="HPDSiHitDetectionEff" value="0.85" />
-<!-- The following parameter is used in Brunel only -->
-<constant name="HPDQuartzWindowEfficiency" value="0.92" />
-
-<!-- End of HPD related parameters for special studies -->
-
-<!-- The following used until the Rich1 QW AR coating is implemented propertly in boundary proc in Gauss -->
-<constant name="Rich1GasQWARCoatingEfficiencyFactor" value="1.0308" />
-
-
-<!-- End of Rich detector property specifications parameters definitions -->
-
- </define>
-
-</lccdd>
diff --git a/compact/components/Rich/trunk/RICH_INFO.md b/compact/components/Rich/trunk/RICH_INFO.md
new file mode 100644
index 0000000000000000000000000000000000000000..de280e38c4929847626c75ce66bb1c5f39195c89
--- /dev/null
+++ b/compact/components/Rich/trunk/RICH_INFO.md
@@ -0,0 +1,18 @@
+
+-------------------------------------------------------------------------------
+The following documentation created on 11-03-2025
+
+The default values of pressure and temperature of the RICH gases updated in Feb-2025 in Detecotor MR!682. This updated are made such that
+the new values are same as those in the lhcb-conditions-database in the sim10/run3-ideal branch, for these gases as of Feb-2025.
+This facilitates the usage of the same values for simulation in Gauss and reconstruction in Moore.
+
+The new values are listed below for reference:
+"C4F10Pressure" value="0.96549918675473*bar"
+"C4F10Temperature" value="295.0083728641*kelvin"
+"CF4Pressure" value="0.96470168675473*bar"
+"CF4Temperature" value="294.03354768216*kelvin"
+
+These updates are made in ../Materials/trunk/RichRun3PropertySpecParam.xml.
+
+More details of this topic can be found in https://gitlab.cern.ch/lhcb/Detector/-/issues/73
+--------------------------------------------------------------------------------------------------
diff --git a/compact/components/Rich/trunk/Rich1/DetElem/RichRun3PropertySpecParam.xml b/compact/components/Rich/trunk/Rich1/DetElem/RichRun3PropertySpecParam.xml
deleted file mode 100644
index 257fac608f06e0f72006ea3140981c68727cdc2b..0000000000000000000000000000000000000000
--- a/compact/components/Rich/trunk/Rich1/DetElem/RichRun3PropertySpecParam.xml
+++ /dev/null
@@ -1,225 +0,0 @@
-<!--===========================================================================-->
-<!-- LHCb Detector material Description -->
-<!--===========================================================================-->
-<!-- -->
-<!-- Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
-<!-- All rights reserved. -->
-<!-- -->
-<!-- @author S.Easo -->
-<!-- @date 02/07/2020 -->
-<!-- -->
-<!--===========================================================================-->
-<!-- Rich detector property specifications parameters definitions -->
-<!--===========================================================================-->
-<lccdd>
-
- <define>
-
-<constant name="AtmospherePressure" value="1.013*bar"/>
-<constant name="AtmosphereTemperature" value="293.0*kelvin"/>
-
-
-<constant name="RhPmtMaxQuantumEff" value="0.60" />
-<constant name="RhMapmtMaxQuantumEff" value="0.6" />
-<constant name="Rh1Mirror1MaxReflectivity" value="0.95" />
-<constant name="Rh1Mirror2MaxReflectivity" value="0.95" />
-<constant name="Rh2Mirror1MaxReflectivity" value="0.95" />
-<constant name="Rh2Mirror2MaxReflectivity" value="0.95" />
-
-<!-- The following line moved to RichRun3GeneralGeomParam.xml -->
-<!-- <constant name="RhZBeyondDownstreamOfRich1" value="3000.0*mm" /> -->
-
-
-<constant name="RichPhotMomWaveCnv" value="1243.125" />
-<constant name="STP_Temperature" value="273.*kelvin" />
-<constant name="STP_Pressure" value="1.01325*bar" />
-<constant name="SellLorGasFac" value="0.3738" />
-<constant name="C4F10Temperature" value="293.*kelvin" />
-<constant name="C4F10ReferenceTemperature" value="293.*kelvin" />
-<constant name="C4F10ReferencePressure" value="STP_Pressure" />
-<constant name="C4F10Pressure" value="1.013*bar" />
-<!-- <constant name="C4F10ReferencePressure" value= "C4F10Pressure" /> -->
-<constant name="C4F10Density" value="0.01195" unit="g/cm3" />
-<constant name="C4F10GasRhoFac" value="(C4F10Pressure/STP_Pressure)*(STP_Temperature/C4F10Temperature)" />
-<constant name="HeraBC4F10A" value="1.0013178"/>
-<constant name="HeraBC4F10B" value="1.723E-7" />
-<constant name="HeraBC4F10C" value="5.495E-6" />
-<constant name="SellC4F10E1" value="18.938" />
-<constant name="SellC4F10E2" value="50.0" />
-<constant name="SellC4F10F1" value="12305.3" />
-<constant name="SellC4F10F2" value="0.0" />
-<constant name="GasMolWeightC4F10" value="138.0" />
-<constant name="RhoEffectiveSellC4F10" value="0.00964" />
-<constant name="Rich1NitrogenDensity" value="0.0008073" unit="g/cm3" />
-<constant name="Rich1NitrogenTemperature" value="293.*kelvin" />
-<constant name="Rich1NitrogenPressure" value="1.013*bar" />
-<constant name="SellN2E1" value="13.414" />
-<constant name="SellN2E2" value="23.215" />
-<constant name="SellN2F1" value="921.28" />
-<constant name="SellN2F2" value="3569.60" />
-<constant name="GasMolWeightN2" value="28.02" />
-<constant name="GasRhoN2atSTP" value="0.00125053" />
-<constant name="N2GasRhoCur" value="GasRhoN2atSTP*(Rich1NitrogenPressure/STP_Pressure)*(STP_Temperature/Rich1NitrogenTemperature)"/>
-<constant name="CF4Temperature" value="293.*kelvin" />
-<constant name="CF4ReferenceTemperatureForSellmeirClassic" value="293.*kelvin" />
-<constant name="CF4ReferenceTemperatureForSellmeirAbjean" value="273.*kelvin" />
-<constant name="CF4Pressure" value="1.013*bar" />
-<constant name="CF4Density" value="0.003884" unit="g/cm3"/>
-<constant name="SellCF4E1" value="20.003" />
-<constant name="SellCF4E2" value="50.0" />
-<constant name="SellCF4F1" value="7626.16" />
-<constant name="SellCF4F2" value="0.0" />
-<constant name="GasMolWeightCF4" value="88" />
-<constant name="GasRhoCF4atSTP" value="0.00366" />
-<constant name="GasRhoCF4atSellClassicReference" value="0.00366" />
-<constant name="C3F8Temperature" value="293.*kelvin" />
-<constant name="C3F8ReferenceTemperature" value="STP_Temperature" />
-<constant name="C3F8Pressure" value="1.013*bar" />
-<constant name="C3F8ReferencePressure" value="STP_Pressure" />
-<constant name="C3F8Density" value="0.0080306" unit="g/cm3" />
-<constant name="GasMolWeightC3F8" value = "188.02" />
-<constant name="C3F8RhoAtSTP" value= "C3F8Density" />
-<constant name="C3F8GasRhoCur" value="(C3F8Pressure/STP_Pressure)*(STP_Temperature/C3F8Temperature)" />
-<constant name="C3F8SellMeirAFactor" value="0.279337" />
-<constant name="C3F8SellMeirAMultFact" value="0.000001" />
-<constant name="C3F8SellmeirLambdaZeroFactorInNanometer" value="64.434073096" />
-<constant name="C3F8SellmeirEphyZeroFactor" value ="RichPhotMomWaveCnv/C3F8SellmeirLambdaZeroFactorInNanometer" />
-<constant name="C3F8SellmeirEphyZeroSquaredFactor" value="C3F8SellmeirEphyZeroFactor*C3F8SellmeirEphyZeroFactor" />
-<constant name="CO2SellmeirAFactor" value ="0.0689781" />
-<constant name="CO2SellmeirMultFacotor" value="0.000001" />
-<constant name="CO2SellmeirLambdaZeroFactor" value="79.9406" />
-<constant name="CO2ReferenceTemperature" value="273.0" />
-<constant name="RichCO2Temperature" value="293.*kelvin" />
-<constant name="RichCO2Pressure" value="1.013*bar" />
-
-<!--
-
- For C3F8 the Sellmeir param obtained from NIMA 381 (1996) 576-577 and converted to
- the formula in photon energy. SE March 18-2010
-
- parameter name="CF4GasRhoCur" value="GasRhoCF4atSTP*(CF4Pressure/STP_Pressure)*(STP_Temperature/CF4Temperature)"
-
- The following modif is to be compatible with cdf paramtrization.
- May2010- The sellmeir for CF4 is at the reference pressure of 1013 mbar and 293 K .
-
- So the label for density is adjusted to reflect this.
-
- In the above the parameter GasRhoCF4atSTP is kept for backward compatibility, although the
- density is that at 1013bar and 293K and not at STP. To avoid confusion a new
- parameter is introduced, namely GasRhoCF4atSellClassicReference.
--->
-
-<constant name="CF4GasRhoCur" value="GasRhoCF4atSellClassicReference" />
-
-
-<!--
- Also for CF4 the second parametrization added; this is at 1013 mbar and 273K. This is
- now used as default. Ref: Abjean etal. NIMA 292 (1990) 593-594.
- Now for the second parametrization of CF4 refractive index in June-7-2010.
- The parameter 0.000261154 from this reference is converted as 1/sqrt(0.000261154)=61.880192909 to
- get the lambdazero parameter.
-
--->
-
-<constant name="CF4SellMeirAFactor" value="0.124523" />
-<constant name="CF4SellMeirAMultFact" value="0.000001" />
-<constant name="CF4SellmeirLambdaZeroFactorInNanometer" value="61.880192909" />
-<constant name="CF4SellmeirEphyZeroFactor" value ="RichPhotMomWaveCnv/CF4SellmeirLambdaZeroFactorInNanometer" />
-<constant name="CF4SellmeirEphyZeroSquaredFactor" value="CF4SellmeirEphyZeroFactor*CF4SellmeirEphyZeroFactor" />
-
-
-
-<constant name="Rich2NitrogenDensity" value="0.0008073" unit="g/cm3" />
-<constant name="Rich2NitrogenTemperature" value="293.*kelvin" />
-<constant name="Rich2NitrogenPressure" value="1.013*bar" />
-
-
-<!-- now for the photon energy ranges c4f10-->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyC4F10" value="1.6*eV" />
-<constant name="PhotonMaxEnergyC4F10" value="6.5*eV" />
-<constant name="PhotonCkvMinEnergyC4F10" value="1.6*eV" />
-<constant name="PhotonCkvMaxEnergyC4F10" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyC4F10" value="1.5*eV" />
-<constant name="PhotonMaxEnergyC4F10" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyC4F10" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyC4F10" value="7.0*eV" />
--->
-<!-- now for the photon energy ranges cf4 -->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyCF4" value="1.6*eV" />
-<constant name="PhotonMaxEnergyCF4" value="6.5*eV" />
-<constant name="PhotonCkvMinEnergyCF4" value="1.6*eV" />
-<constant name="PhotonCkvMaxEnergyCF4" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyCF4" value="1.5*eV" />
-<constant name="PhotonMaxEnergyCF4" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyCF4" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyCF4" value="7.0*eV" />
--->
-<!-- now for the photon energy ranges anywhere in RICH , for example in Hpd -->
-<!-- The following refined for the DD4HEP framework as a temporary measure. Sep 2021-->
-<!-- This may be reviewed in the future -->
-<constant name="PhotonMinEnergyInRICH" value="1.6*eV" />
-<constant name="PhotonMaxEnergyInRICH" value="6.5*eV" />
-<!--
-<constant name="PhotonMinEnergyInRICH" value="1.5*eV" />
-<constant name="PhotonMaxEnergyInRICH" value="7.5*eV" />
--->
-<!-- Now for CF4 Scintillation -->
-<constant name = "CF4ScintillationFastTimeConstantInNanoSec" value="10.0" />
-<constant name = "CF4ScintillationYieldPerMeV" value="2000.0" />
-<constant name = "CF4ScintillationResolutionScale" value="1.0" />
-
-
-<!-- End of the RichPropertySpecification Parameters -->
-<constant name="PMTSiHitDetectionEff" value="0.90" />
-
-<!-- The following param is used only in Brunel -->
-<constant name="PMTQuartzWindowEfficiency" value="0.92" />
-
-
-<!-- Aerogel optical parameters kept for special studies although not used in RUN3 -->
-<constant name="AgelMeasuredClarity" value="0.006" />
-<constant name="AgelDefaultClarity" value="0.006" />
-<constant name="Rich1AerogelSurfScatConstA" value="0.9368" />
-<!-- now for the photon energy ranges Aerogel-->
-<constant name="SellAgelE1" value="10.666" />
-<constant name="SellAgelE2" value="18.125" />
-<constant name="SellAgelF1" value="2.653" />
-<constant name="SellAgelF2" value="13.075" />
-
-<constant name="PhotonMinEnergyAerogel" value="1.5*eV" />
-<constant name="PhotonMaxEnergyAerogel" value="7.5*eV" />
-<constant name="PhotonCkvMinEnergyAerogel" value="1.75*eV" />
-<constant name="PhotonCkvMaxEnergyAerogel" value="4.5*eV" />
-
-
-<constant name="AerogelThickness" value="50.0*mm" />
-<constant name="AgelfixedLambdaValue" value="632.8*nanometer" />
-
-<!-- End of Aerogel parameters for special studies -->
-
-
-
-<!-- The following kept for any special studies although not part of standard RUN3 -->
-<!-- HPD related parameters for special studies and potential backward compatibility -->
-<constant name="RhHpdMaxQuantumEff" value="0.45" />
-<constant name="HPDSiHitDetectionEff" value="0.85" />
-<!-- The following parameter is used in Brunel only -->
-<constant name="HPDQuartzWindowEfficiency" value="0.92" />
-
-<!-- End of HPD related parameters for special studies -->
-
-<!-- The following used until the Rich1 QW AR coating is implemented propertly in boundary proc in Gauss -->
-<constant name="Rich1GasQWARCoatingEfficiencyFactor" value="1.0308" />
-
-
-<!-- End of Rich detector property specifications parameters definitions -->
-
- </define>
-
-</lccdd>
diff --git a/compact/components/debug/Rich1/Rich1-v0.xml b/compact/components/debug/Rich1/Rich1-v0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..604abbcb071ba5487b31496e9875f3e64cc746ca
--- /dev/null
+++ b/compact/components/debug/Rich1/Rich1-v0.xml
@@ -0,0 +1,28 @@
+<!-- ========================================================================== -->
+<!-- LHCb Detector Description -->
+<!-- ========================================================================== -->
+<!-- -->
+<!-- Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!-- All rights reserved. -->
+<!-- -->
+<!-- @author M.Frank -->
+<!-- @date 14/10/2018 -->
+<!-- -->
+<!-- ========================================================================== -->
+
+<lccdd>
+
+ <debug>
+ <type name="includes" value="0" />
+ <type name="incguard" value="1" />
+ </debug>
+
+ <includes>
+ <file ref="../../Materials/2024-v00.00/common.xml" />
+ <file ref="../../Pipe/2024-v00.00/PipeCommon.xml" />
+ <file ref="../../Regions/2024-v00.00/Regions-invisible.xml"/>
+ </includes>
+
+ <include ref="../../Rich/before-rich1-geom-update-26052022/Rich1/Rich1.xml" />
+
+</lccdd>
diff --git a/compact/components/debug/Rich2/Rich2-v0.xml b/compact/components/debug/Rich2/Rich2-v0.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d8c14bf80f9bf800e49e14cc61ea046a1085c92a
--- /dev/null
+++ b/compact/components/debug/Rich2/Rich2-v0.xml
@@ -0,0 +1,28 @@
+<!-- ========================================================================== -->
+<!-- LHCb Detector Description -->
+<!-- ========================================================================== -->
+<!-- -->
+<!-- Copyright (C) Organisation europeenne pour la Recherche nucleaire (CERN) -->
+<!-- All rights reserved. -->
+<!-- -->
+<!-- @author M.Frank -->
+<!-- @date 14/10/2018 -->
+<!-- -->
+<!-- ========================================================================== -->
+
+<lccdd>
+
+ <debug>
+ <type name="includes" value="0" />
+ <type name="incguard" value="1" />
+ </debug>
+
+ <includes>
+ <file ref="../../Materials/2024-v00.00/common.xml" />
+ <file ref="../../Pipe/2024-v00.00/PipeCommon.xml" />
+ <file ref="../../Regions/2024-v00.00/Regions-invisible.xml"/>
+ </includes>
+
+ <include ref="../../Rich/before-rich1-geom-update-26052022/Rich2/Rich2.xml" />
+
+</lccdd>
diff --git a/compact/run3/2025-v00.00/LHCb.xml b/compact/run3/2025-v00.00/LHCb.xml
index ea404c898279fca2d928ec6590540df0ad681ced..ad9b9bd0a41421b83270b7f0fef32118dcc66a23 100644
--- a/compact/run3/2025-v00.00/LHCb.xml
+++ b/compact/run3/2025-v00.00/LHCb.xml
@@ -17,7 +17,7 @@
<includes>
- <file ref="../../components/Materials/trunk/common.xml" /> <!-- We cannot change the location of this file, for some reason, materials must be defined first.-->
+ <file ref="../../components/Materials/2024-v00.00/common.xml" /> <!-- We cannot change the location of this file, for some reason, materials must be defined first.-->
<file ref="path.xml" />
<file ref="${path:Pipe}/PipeCommon.xml" />
</includes>
diff --git a/compact/run3/before-rich1-geom-update-26052022/LHCb.xml b/compact/run3/before-rich1-geom-update-26052022/LHCb.xml
index 4264ac609076743f788764b911a1c7f6a66b34b1..bc3512ca19aa1d63ccaa64f33fdc5661e26a2537 100644
--- a/compact/run3/before-rich1-geom-update-26052022/LHCb.xml
+++ b/compact/run3/before-rich1-geom-update-26052022/LHCb.xml
@@ -16,7 +16,7 @@
</debug>
<includes>
- <file ref="../../components/Materials/trunk/common.xml" /> <!-- We cannot change the location of this file, for some reason, materials must be defined first.-->
+ <file ref="../../components/Materials/2024-v00.00/common.xml" /> <!-- We cannot change the location of this file, for some reason, materials must be defined first.-->
<file ref="path.xml" />
<file ref="${path:Pipe}/PipeCommon.xml" />
</includes>
diff --git a/compact/run3/before-rich1-geom-update-26052022/path.xml b/compact/run3/before-rich1-geom-update-26052022/path.xml
index 2d7a90099f8c15df4558901c670edae38f5fbb86..f4bc6610e9278a6fb4e9900d62f15f05dae790b6 100644
--- a/compact/run3/before-rich1-geom-update-26052022/path.xml
+++ b/compact/run3/before-rich1-geom-update-26052022/path.xml
@@ -24,6 +24,6 @@
<constant name="path:ECAL" value="../../components/ECAL/trunk" type="string"/>
<constant name="path:HCAL" value="../../components/HCAL/trunk" type="string"/>
<constant name="path:Regions" value="../../components/Regions/trunk" type="string"/>
- <constant name="path:Materials" value="../../components/Materials/trunk" type="string"/>
+ <constant name="path:Materials" value="../../components/Materials/2024-v00.00" type="string"/>
</define>
</lccdd>