From d3a8d7f2ca1b489bb9f2232662504669170be046 Mon Sep 17 00:00:00 2001 From: martinunland Date: Fri, 6 Sep 2024 16:53:17 +0200 Subject: [PATCH] updated weights --- .../CE_weight/240813_mDOM_Hamamatsu_CAT.dat | 166 ------------------ .../CE_weight/240813_mDOM_Hamamatsu_CT.dat | 166 ++++++++++++++++++ common/data/PMTs/pmt_Hamamatsu_R15458_CT.dat | 2 +- .../OMSim_efficiency_calibration.cc | 10 +- .../src/OMSimEffiCaliAnalyisis.cc | 4 +- 5 files changed, 174 insertions(+), 174 deletions(-) delete mode 100644 common/data/PMTs/measurement_matching_data/CE_weight/240813_mDOM_Hamamatsu_CAT.dat create mode 100644 common/data/PMTs/measurement_matching_data/CE_weight/240813_mDOM_Hamamatsu_CT.dat diff --git a/common/data/PMTs/measurement_matching_data/CE_weight/240813_mDOM_Hamamatsu_CAT.dat b/common/data/PMTs/measurement_matching_data/CE_weight/240813_mDOM_Hamamatsu_CAT.dat deleted file mode 100644 index 4cd9c5a8b..000000000 --- a/common/data/PMTs/measurement_matching_data/CE_weight/240813_mDOM_Hamamatsu_CAT.dat +++ /dev/null @@ -1,166 +0,0 @@ -#R(mm) Weight -0 1.0 -0.125 0.9999999999999999 -0.375 1.0 -0.625 0.9999999999999999 -0.875 0.9999999999999999 -1.125 1.0 -1.375 0.9999999999999999 -1.625 0.9999999999999999 -1.875 1.0 -2.125 0.9999999999999999 -2.375 0.9999999999999999 -2.625 1.0 -2.875 0.9999999999999999 -3.125 0.9999999999999999 -3.375 1.0 -3.625 0.9999999999999999 -3.875 0.9999999999878653 -4.125 0.9999999999635962 -4.375 0.9999999999393269 -4.625 0.9999999999192467 -4.875 0.9999999999033558 -5.125 0.9999999998874645 -5.375 0.9999999998795188 -5.625 0.9999999998795186 -5.875 0.9999999998795182 -6.125 0.9999999998795164 -6.375 0.9999999998795129 -6.625 0.9999999998795095 -6.875 0.9999999998795077 -7.125 0.9999999998795078 -7.375 0.9999999998795077 -7.625 0.9999999998767996 -7.875 0.9999999998713833 -8.125 0.9999999998659668 -8.375 0.9999999998622686 -8.625 0.9999999998602886 -8.875 0.9999999998583085 -9.125 0.9999999998561758 -9.375 0.9999999998538905 -9.625 0.9999999998516053 -9.875 0.998128456373167 -10.125 0.994385369418576 -10.375 0.9906422824639848 -10.625 0.9887707363172326 -10.875 0.9887707309783194 -11.125 0.9887707256394059 -11.375 0.9867444826587118 -11.625 0.9826920020362371 -11.875 0.9786395214137621 -12.125 0.9766129281655926 -12.375 0.9766122222917287 -12.625 0.9766115164178646 -12.875 0.9766111605851734 -13.125 0.9766111547936551 -13.375 0.9766111490021366 -13.625 0.9766111460334115 -13.875 0.9766111458874798 -14.125 0.9766111457415478 -14.375 0.9766111455989399 -14.625 0.9766111454596562 -14.875 0.9766111453203723 -15.125 0.9766111448941606 -15.375 0.976611144181021 -15.625 0.9766111434678812 -15.875 0.9766111416634822 -16.125 0.9766111387678236 -16.375 0.9766111358721647 -16.625 0.9766111343257926 -16.875 0.976611134128707 -17.125 0.9766111339316212 -17.375 0.9766111338216569 -17.625 0.9766111337988139 -17.875 0.9766111337759709 -18.125 0.9766111330411237 -18.375 0.9766111315942725 -18.625 0.976611130147421 -18.875 0.9766111283288063 -19.125 0.9766111261384284 -19.375 0.9766111239480503 -19.625 0.975525034084468 -19.875 0.9733528565476816 -20.125 0.9711806790108949 -20.375 0.9732427670409354 -20.625 0.979539120637803 -20.875 0.9858354742346703 -21.125 0.9829451804634468 -21.375 0.9708682393241326 -21.625 0.9587912981848182 -21.875 0.9420723388005366 -22.125 0.9207113611712878 -22.375 0.8993503835420389 -22.625 0.8848022917500546 -22.875 0.8770670857953349 -23.125 0.869331879840615 -23.375 0.882130902912041 -23.625 0.915464155009613 -23.875 0.9487974071071849 -24.125 0.982130699043799 -24.375 1.0154640308194554 -24.625 1.0487973625951117 -24.875 1.051802853719133 -25.125 1.024480504191519 -25.375 0.997158154663905 -25.625 0.9817064788076677 -25.875 0.9781254766228071 -26.125 0.9745444744379465 -26.375 0.9769646671412628 -26.625 0.9853860547327564 -26.875 0.9938074423242498 -27.125 1.0062243073828405 -27.375 1.0226366499085286 -27.625 1.0390489924342166 -27.875 1.033572368833113 -28.125 1.006206779105218 -28.375 0.978841189377323 -28.625 0.944005744788414 -28.875 0.9017004453384914 -29.125 0.8593951458885687 -29.375 0.8386863968958811 -29.625 0.8395741983604286 -29.875 0.840461999824976 -30.125 0.834564850525448 -30.375 0.8218827504618444 -30.625 0.8092006503982407 -30.875 0.8044886828299448 -31.125 0.8077468477569564 -31.375 0.8110050126839679 -31.625 0.8071815150181038 -31.875 0.7962763547593641 -32.125 0.7853711945006242 -32.375 0.7858569066825594 -32.625 0.7977334913051695 -32.875 0.8096100759277796 -33.125 0.8043572313224525 -33.375 0.7819749574891883 -33.625 0.7595926836559243 -33.875 0.7557275806066293 -34.125 0.7703796483413035 -34.375 0.7850317160759775 -34.625 0.7700657341748053 -34.875 0.7254817026377867 -35.125 0.6808976711007678 -35.375 0.6710860921865538 -35.625 0.6960469658951446 -35.875 0.7210078396037353 -36.125 0.7501549422181033 -36.375 0.7834882737382487 -36.625 0.816821605258394 -36.875 0.7480765039492171 -37.125 0.5772529698107182 -37.375 0.40642943567221906 -37.625 0.26751472383580793 -37.875 0.16050883430148477 -38.125 0.05350294476716159 -38.375 0.0 -38.625 0.0 -38.875 0.0 -39.125 0.0 -39.375 0.0 -39.625 0.0 -39.875 0.0 -40.125 0.0 -40.375 0.0 -40.625 0.0 -40.875 0.0 diff --git a/common/data/PMTs/measurement_matching_data/CE_weight/240813_mDOM_Hamamatsu_CT.dat b/common/data/PMTs/measurement_matching_data/CE_weight/240813_mDOM_Hamamatsu_CT.dat new file mode 100644 index 000000000..9ec6b0a8b --- /dev/null +++ b/common/data/PMTs/measurement_matching_data/CE_weight/240813_mDOM_Hamamatsu_CT.dat @@ -0,0 +1,166 @@ +#R(mm) Weight +0 1.0 +0.125 0.9999999999999999 +0.375 1.0 +0.625 0.9999999999999999 +0.875 0.9999999999999999 +1.125 1.0 +1.375 0.9999999999999999 +1.625 0.9999999999999999 +1.875 1.0 +2.125 0.9999999999999999 +2.375 0.9999999999999999 +2.625 1.0 +2.875 0.9999999999999999 +3.125 0.9999999999999964 +3.375 0.9999999999999898 +3.625 0.9999999999999829 +3.875 0.9999999999999638 +4.125 0.9999999999999325 +4.375 0.999999999999901 +4.625 0.9999999999998658 +4.875 0.9999999999998268 +5.125 0.9999999999997875 +5.375 0.9999999999997581 +5.625 0.9999999999997384 +5.875 0.9999999999997186 +6.125 0.9999999999997078 +6.375 0.9999999999997062 +6.625 0.9999999999997046 +6.875 0.9999999999996805 +7.125 0.999999999999634 +7.375 0.9999999999995872 +7.625 0.9999999999995409 +7.875 0.9999999999994948 +8.125 0.9999999999994486 +8.375 0.999999999999404 +8.625 0.9999999999993612 +8.875 0.9999999999993182 +9.125 0.9999999999992806 +9.375 0.9999999999992482 +9.625 0.9999999999992157 +9.875 0.9999999999991989 +10.125 0.9999999999991979 +10.375 0.9999999999991966 +10.625 0.999999993200882 +10.875 0.9999999796042536 +11.125 0.9999999660076251 +11.375 0.9975274362068567 +11.625 0.9925823902019486 +11.875 0.9876373441970404 +12.125 0.9851648209605832 +12.375 0.9851648204925773 +12.625 0.9851648200245711 +12.875 0.983894545121476 +13.125 0.9813539957832917 +13.375 0.9788134464451075 +13.625 0.9769042443447167 +13.875 0.9756263894821195 +14.125 0.9743485346195222 +14.375 0.9733925322515097 +14.625 0.9727583823780819 +14.875 0.9721242325046539 +15.125 0.971807107782619 +15.375 0.9718070082119774 +15.625 0.9718069086413357 +15.875 0.9718068588557125 +16.125 0.9718068588551078 +16.375 0.9718068588545029 +16.625 0.971441868805622 +16.875 0.9707118887084649 +17.125 0.9699819086113077 +17.375 0.9696169185610023 +17.625 0.9696169185575488 +17.875 0.9696169185540952 +18.125 0.9696169185523409 +18.375 0.9696169185522862 +18.625 0.9696169185522312 +18.875 0.9696169185522037 +19.125 0.9696169185522034 +19.375 0.9696169185522031 +19.625 0.9696169185521923 +19.875 0.969616918552171 +20.125 0.9696169185521495 +20.375 0.9723643817103738 +20.625 0.977859308026844 +20.875 0.9833542343433139 +21.125 0.9831083493856938 +21.375 0.9771216531539835 +21.625 0.9711349569222731 +21.875 0.9539573685715582 +22.125 0.9255888881018388 +22.375 0.8972204076321193 +22.625 0.883703644545668 +22.875 0.8850385988424847 +23.125 0.8863735531393013 +23.375 0.903707696954372 +23.625 0.937041030287697 +23.875 0.9703743636210217 +24.125 1.0037076969543508 +24.375 1.0370410302876842 +24.625 1.0703743636210175 +24.875 1.0940017328942537 +25.125 1.107923138107393 +25.375 1.1218445433205324 +25.625 1.1123496774343762 +25.875 1.0794385404489242 +26.125 1.0465274034634722 +26.375 1.0225420040625708 +26.625 1.0074823422462207 +26.875 0.9924226804298701 +27.125 0.9909854455605147 +27.375 1.0031706376381542 +27.625 1.0153558297157936 +27.875 1.017004080379585 +28.125 1.008115389629528 +28.375 0.9992266988794711 +28.625 0.9713348638937703 +28.875 0.9244398846724258 +29.125 0.8775449054510811 +29.375 0.8501792026475027 +29.625 0.8423427762616906 +29.875 0.8345063498758784 +30.125 0.8283469279287394 +30.375 0.823864510420274 +30.625 0.8193820929118084 +30.875 0.8159453493102302 +31.125 0.8135542796155393 +31.375 0.8111632099208483 +31.625 0.80655031178619 +31.875 0.799715585211564 +32.125 0.792880858636938 +32.375 0.7929234706583959 +32.625 0.7998434212759373 +32.875 0.8067633718934787 +33.125 0.8008347043342149 +33.375 0.7820574185981459 +33.625 0.7632801328620767 +33.875 0.7594002161127418 +34.125 0.7704176683501411 +34.375 0.7814351205875404 +34.625 0.767496223962353 +34.875 0.7286009784745788 +35.125 0.6897057329868048 +35.375 0.6837753996847189 +35.625 0.7108099785683215 +35.875 0.737844557451924 +36.125 0.7680285135603226 +36.375 0.8013618468935175 +36.625 0.8346951802267122 +36.875 0.7619826333711864 +37.125 0.5832242063269402 +37.375 0.4044657792826939 +37.625 0.262572138133809 +37.875 0.1575432828802854 +38.125 0.0525144276267618 +38.375 0.0 +38.625 0.0 +38.875 0.0 +39.125 0.0 +39.375 0.0 +39.625 0.0 +39.875 0.0 +40.125 0.0 +40.375 0.0 +40.625 0.0 +40.875 0.0 diff --git a/common/data/PMTs/pmt_Hamamatsu_R15458_CT.dat b/common/data/PMTs/pmt_Hamamatsu_R15458_CT.dat index 7e9030adb..fce8dad82 100644 --- a/common/data/PMTs/pmt_Hamamatsu_R15458_CT.dat +++ b/common/data/PMTs/pmt_Hamamatsu_R15458_CT.dat @@ -3,7 +3,7 @@ "jFrontalShape": "TwoEllipses", "jDefaultQEFileName": "../common/data/PMTs/measurement_matching_data/QE/mDOM_Hamamatsu_R15458_mean_QE.dat", "jAbsorbedFractionFileName": "../common/data/PMTs/measurement_matching_data/QE/mDOM_Hamamatsu_R15458_CT_intrinsic_QE.dat", - "jCEweightsFileName": "../common/data/PMTs/measurement_matching_data/CE_weight/240813_mDOM_Hamamatsu_CAT.dat", + "jCEweightsFileName": "../common/data/PMTs/measurement_matching_data/CE_weight/240813_mDOM_Hamamatsu_CT.dat", "jScanDataPath" : "../common/data/PMTs/measurement_matching_data/scans/R15458/", "jScannedWavelengths": [460, 480, 500, 520, 540, 560, 580, 600, 620, 640], "jBulbBackShape": "FullFit", diff --git a/simulations/efficiency_calibration/OMSim_efficiency_calibration.cc b/simulations/efficiency_calibration/OMSim_efficiency_calibration.cc index 1369fc2a9..b8cac2cb7 100755 --- a/simulations/efficiency_calibration/OMSim_efficiency_calibration.cc +++ b/simulations/efficiency_calibration/OMSim_efficiency_calibration.cc @@ -41,11 +41,11 @@ void runXYZfrontalScan() analysisManager.m_outputFileName = args.get("output_file") + ".dat"; scanner->setWavelength(459); - //std::vector grid = Tools::arange(-41, 42, 1); //mDOM - std::vector grid = Tools::arange(-52.8, 52.8, 1.25); //LOM...1.6 in scan but causes two 0 values + std::vector grid = Tools::arange(-41, 42, 0.75); //mDOM + //std::vector grid = Tools::arange(-52.8, 52.8, 1.25); //LOM...1.6 in scan but causes two 0 values - //double rLim = 42; //mDOM - double rLim = 53; //LOM + double rLim = 42; //mDOM + //double rLim = 53; //LOM for (const auto &x : grid) { @@ -60,7 +60,7 @@ void runXYZfrontalScan() } } - grid = Tools::arange(-7, 7, 0.3); // so more data at centre + grid = Tools::arange(-7, 7, 0.5); // so more data at centre for (const auto &x : grid) { diff --git a/simulations/efficiency_calibration/src/OMSimEffiCaliAnalyisis.cc b/simulations/efficiency_calibration/src/OMSimEffiCaliAnalyisis.cc index e9af0ee95..8ee9bd906 100644 --- a/simulations/efficiency_calibration/src/OMSimEffiCaliAnalyisis.cc +++ b/simulations/efficiency_calibration/src/OMSimEffiCaliAnalyisis.cc @@ -21,8 +21,8 @@ void OMSimEffiCaliAnalyisis::writeHitPositionHistogram(double x, double y) detectionProbability.push_back(hits.PMTresponse.at(i).detectionProbability); } - //auto lRange = Tools::arange(0, 41.25, 0.25); //mDOM - auto lRange = Tools::arange(0, 52.4, 0.275); //LOM + auto lRange = Tools::arange(0, 41.25, 0.25); //mDOM + //auto lRange = Tools::arange(0, 52.4, 0.275); //LOM auto [lCounts, lEdges] = Tools::histogram(r, lRange); auto [lCountsWeighted, lEdgesWeighted] = Tools::histogram(r, lRange, std::nullopt, detectionProbability);