updated weights

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

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",

simulations/efficiency_calibration/OMSim_efficiency_calibration.cc

@@ -41,11 +41,11 @@ void runXYZfrontalScan()
  analysisManager.m_outputFileName = args.get<std::string>("output_file") + ".dat";
  scanner->setWavelength(459);
 
- //std::vector<double> grid = Tools::arange(-41, 42, 1); //mDOM
- std::vector<double> grid = Tools::arange(-52.8, 52.8, 1.25); //LOM...1.6 in scan but causes two 0 values
+ std::vector<double> grid = Tools::arange(-41, 42, 0.75); //mDOM
+ //std::vector<double> 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)
  {

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);