all pmts working

icecube · Sep 2, 2024 · a09f379 · a09f379
1 parent e4af698
commit a09f379
Show file tree

Hide file tree

Showing 20 changed files with 205 additions and 9,240 deletions.
diff --git a/...DOM_Hamamatsu_R15458_CAT_intrinsic_QE.dat → ...mDOM_Hamamatsu_R15458_CT_intrinsic_QE.dat b/...DOM_Hamamatsu_R15458_CAT_intrinsic_QE.dat → ...mDOM_Hamamatsu_R15458_CT_intrinsic_QE.dat
diff --git a/common/data/PMTs/pmt_ETEL_9320KFL-KFB.dat → ...a/PMTs/old_stuff/pmt_ETEL_9320KFL-KFB.dat b/common/data/PMTs/pmt_ETEL_9320KFL-KFB.dat → ...a/PMTs/old_stuff/pmt_ETEL_9320KFL-KFB.dat
diff --git a/common/data/PMTs/pmt_HZC_XP82B2F.dat → ...n/data/PMTs/old_stuff/pmt_HZC_XP82B2F.dat b/common/data/PMTs/pmt_HZC_XP82B2F.dat → ...n/data/PMTs/old_stuff/pmt_HZC_XP82B2F.dat
diff --git a/...ata/PMTs/pmt_Hamamatsu_R5912_20_100_o.dat → ...ld_stuff/pmt_Hamamatsu_R5912_20_100_o.dat b/...ata/PMTs/pmt_Hamamatsu_R5912_20_100_o.dat → ...ld_stuff/pmt_Hamamatsu_R5912_20_100_o.dat
diff --git a/common/data/PMTs/pmt_dEGG.dat → common/data/PMTs/old_stuff/pmt_dEGG.dat b/common/data/PMTs/pmt_dEGG.dat → common/data/PMTs/old_stuff/pmt_dEGG.dat
diff --git a/common/data/PMTs/pmt_Hamamatsu_4inch.dat b/common/data/PMTs/pmt_Hamamatsu_4inch.dat
@@ -3,8 +3,12 @@
  "jFrontalShape": "SphereEllipse",
  "jResponseData" : "LOMHama",
  "jBulbBackShape": "jFullFit",
- "jDynodeCADOffset": {
- "jValue": 108,
+ "jDynodeCADZ0": {
+ "jValue": 54.2, 
+ "jUnit": "mm"
+ },
+ "jDynodeCADOffsetFromTip": {
+ "jValue": 54,
  "jUnit": "mm"
  },
  "jDynodeCADscale": {
@@ -77,32 +81,6 @@
  "jUnit": "mm"
  }
  },
- "jPhotocathodeInnerSide": {
- "jOutRad": {
- "jValue": 62.99998,
- "jUnit": "mm"
- },
- "jEllipseXYaxis": {
- "jValue": 49.178927229536676,
- "jUnit": "mm"
- },
- "jEllipseZaxis": {
- "jValue": 23.02333087156919,
- "jUnit": "mm"
- },
- "jSphereEllipseTransition_r": {
- "jValue": 42.33933144813033,
- "jUnit": "mm"
- },
- "jSpherePos_y": {
- "jValue": 4.375298566849885,
- "jUnit": "mm"
- },
- "jEllipsePos_y": {
- "jValue": 39.38172984911411,
- "jUnit": "mm"
- }
- },
  "jInnerShape": {
  "jTotalLenght": {
  "jValue": 100.1,

diff --git a/common/data/PMTs/pmt_Hamamatsu_R15458_CAT.dat b/common/data/PMTs/pmt_Hamamatsu_R15458_CAT.dat
@@ -1,9 +1,11 @@
 {
- "jName": "pmt_Hamamatsu_R15458_CAT",
+ "jName": "pmt_Hamamatsu_R15458_CT",
  "jFrontalShape": "TwoEllipses",
- "jQEfile": "../common/data/PMTs/QE/mDOM_Hamamatsu_R15458_mean_QE.dat",
- "jQEMatchingfile": "../common/data/PMTs/QE/mDOM_Hamamatsu_R15458_QE_matching_parameters.dat",
- "jResponseData" : "R15458",
+ "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",
+ "jScanDataPath" : "../common/data/PMTs/measurement_matching_data/scans/R15458/",
+ "jScannedWavelengths": [460, 480, 500, 520, 540, 560, 580, 600, 620, 640],
  "jBulbBackShape": "FullFit",
  "jDynodeCADZ0": {
  "jValue": 54.2, 
@@ -180,47 +182,5 @@
  "jValue": 43.15546600733366,
  "jUnit": "mm"
  }
- },
- "jPhotocathodeInnerSide": {
- "jOutRad": {
- "jValue": 50.74998,
- "jUnit": "mm"
- },
- "jEllipseXYaxis": {
- "jValue": 37.87047960594932,
- "jUnit": "mm"
- },
- "jEllipseZaxis": {
- "jValue": 18.016285135798817,
- "jUnit": "mm"
- },
- "jSphereEllipseTransition_r": {
- "jValue": 27.723650768764383,
- "jUnit": "mm"
- },
- "jSpherePos_y": {
- "jValue": -0.010783645107885846,
- "jUnit": "mm"
- },
- "jEllipsePos_y": {
- "jValue": 32.70727527269426,
- "jUnit": "mm"
- },
- "jEllipseXYaxis_2": {
- "jValue": 89.37457755820488,
- "jUnit": "mm"
- },
- "jEllipseZaxis_2": {
- "jValue": 179.687132489712,
- "jUnit": "mm"
- },
- "jEllipsePos_y_2": {
- "jValue": -125.48879245450442,
- "jUnit": "mm"
- },
- "jEllipseEllipseTransition_y": {
- "jValue": 46.17334413145984,
- "jUnit": "mm"
- }
  }
 }
diff --git a/common/data/PMTs/pmt_Hamamatsu_R5912_20_100.dat b/common/data/PMTs/pmt_Hamamatsu_R5912_20_100.dat
@@ -3,8 +3,12 @@
  "jFrontalShape": "SingleEllipse",
  "jResponseData" : "R5912",
  "jBulbBackShape": "jFullFit",
- "jDynodeCADOffset": {
- "jValue": 220,
+ "jDynodeCADZ0": {
+ "jValue": 54.2, 
+ "jUnit": "mm"
+ },
+ "jDynodeCADOffsetFromTip": {
+ "jValue": 166,
  "jUnit": "mm"
  },
  "jDynodeCADscale": {
@@ -77,32 +81,6 @@
  "jUnit": "mm"
  }
  },
- "jPhotocathodeInnerSide": {
- "jOutRad": {
- "jValue": 129.04998,
- "jUnit": "mm"
- },
- "jEllipseXYaxis": {
- "jValue": 100.38334947030255,
- "jUnit": "mm"
- },
- "jEllipseZaxis": {
- "jValue": 73.89682198437058,
- "jUnit": "mm"
- },
- "jSphereEllipseTransition_r": {
- "jValue": 26.582204066415937,
- "jUnit": "mm"
- },
- "jSpherePos_y": {
- "jValue": 49.29081214651022,
- "jUnit": "mm"
- },
- "jEllipsePos_y": {
- "jValue": 104.31452256983141,
- "jUnit": "mm"
- }
- },
  "jInnerShape": {
  "jTotalLenght": {
  "jValue": 216.1,

diff --git a/common/data/PMTs/pmt_Hamamatsu_R7081.dat b/common/data/PMTs/pmt_Hamamatsu_R7081.dat
@@ -3,8 +3,12 @@
  "jFrontalShape": "TwoEllipses",
  "jResponseData" : "R7081",
  "jBulbBackShape": "FullFit",
- "jDynodeCADOffset": {
- "jValue": 240,
+ "jDynodeCADZ0": {
+ "jValue": 54.2, 
+ "jUnit": "mm"
+ },
+ "jDynodeCADOffsetFromTip": {
+ "jValue": 186,
  "jUnit": "mm"
  },
  "jDynodeCADscale": {
@@ -89,44 +93,6 @@
  "jUnit": "mm"
  }
  },
- "jPhotocathodeInnerSide": {
- "jOutRad": {
- "jValue": 134.69997999999998,
- "jUnit": "mm"
- },
- "jEllipseXYaxis": {
- "jValue": 124.65430815147766,
- "jUnit": "mm"
- },
- "jEllipseZaxis": {
- "jValue": 70.562170108579,
- "jUnit": "mm"
- },
- "jSphereEllipseTransition_r": {
- "jValue": 25.69504701968474,
- "jUnit": "mm"
- },
- "jSpherePos_y": {
- "jValue": 45.07733050472109,
- "jUnit": "mm"
- },
- "jEllipsePos_y": {
- "jValue": 88.53162521532929,
- "jUnit": "mm"
- },
- "jEllipseXYaxis_2": {
- "jValue": 127.75821003544209,
- "jUnit": "mm"
- },
- "jEllipseZaxis_2": {
- "jValue": 130.68898357127853,
- "jUnit": "mm"
- },
- "jEllipsePos_y_2": {
- "jValue": 49.28542133858265,
- "jUnit": "mm"
- }
- },
  "jInnerShape": {
  "jTotalLenght": {
  "jValue": 241.0,

diff --git a/common/framework/include/OMSimCommandArgsTable.hh b/common/framework/include/OMSimCommandArgsTable.hh
@@ -87,13 +87,13 @@ public:
  }
  catch (const boost::bad_any_cast &e)
  {
- log_error(("Failed to get parameter " + p_key + " as type " + typeid(T).name()).c_str());
+ log_error(("Failed to get parameter '" + p_key + "' as type " + typeid(T).name()).c_str());
  throw std::invalid_argument("Failed to get parameter " + p_key + " as type " + typeid(T).name());
  }
  catch (const std::out_of_range &e)
  {
- log_error(("Parameter " + p_key + " does not exist").c_str());
- throw std::invalid_argument("Parameter " + p_key + " does not exist");
+ log_error(("Parameter '" + p_key + "'does not exist").c_str());
+ throw std::invalid_argument("Parameter '" + p_key + "' does not exist");
  }
  }