Skip to content

Commit

Permalink
added pDOM HQE
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinunland
martinunland committed Dec 21, 2024
1 parent cadc1d4 commit 52b5c82
Show file tree
Hide file tree
Showing 12 changed files with 266 additions and 18 deletions.
0 ...g_data/QE/DOM_Hamamatsu_R7081_mean_QE.dat → ...tching_data/QE/DOM_Hamamatsu_R7081_QE.dat
View file
File renamed without changes.
49 changes: 49 additions & 0 deletions common/data/PMTs/measurement_matching_data/QE/pDOM_Hamamatsu_R7081_HQE.dat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Wavelength(nm) QE
2.600000000000000000e+02 0.000000000000000000e+00
2.700000000000000000e+02 1.350000000000000288e-04
2.800000000000000000e+02 2.700000000000000577e-04
2.900000000000000000e+02 4.320000000000000923e-03
3.000000000000000000e+02 3.793500000000000344e-02
3.100000000000000000e+02 1.000349999999999989e-01
3.200000000000000000e+02 1.841399999999999981e-01
3.300000000000000000e+02 2.435400000000000342e-01
3.400000000000000000e+02 2.807999999999999940e-01
3.500000000000000000e+02 3.029399999999999871e-01
3.600000000000000000e+02 3.125250000000000528e-01
3.700000000000000000e+02 3.196800000000000197e-01
3.800000000000000000e+02 3.218400000000000150e-01
3.900000000000000000e+02 3.302100000000000590e-01
4.000000000000000000e+02 3.300750000000000073e-01
4.100000000000000000e+02 3.295350000000000223e-01
4.200000000000000000e+02 3.283200000000000007e-01
4.300000000000000000e+02 3.150900000000000367e-01
4.400000000000000000e+02 3.046950000000000491e-01
4.500000000000000000e+02 2.943000000000000060e-01
4.600000000000000000e+02 2.782350000000000101e-01
4.700000000000000000e+02 2.578500000000000236e-01
4.800000000000000000e+02 2.420549999999999924e-01
4.900000000000000000e+02 2.290949999999999931e-01
5.000000000000000000e+02 2.195100000000000107e-01
5.100000000000000000e+02 2.046600000000000363e-01
5.200000000000000000e+02 1.729350000000000054e-01
5.300000000000000000e+02 1.355400000000000216e-01
5.400000000000000000e+02 1.105650000000000105e-01
5.500000000000000000e+02 9.531000000000000583e-02
5.600000000000000000e+02 8.370000000000001050e-02
5.700000000000000000e+02 7.276500000000001023e-02
5.800000000000000000e+02 6.156000000000000361e-02
5.900000000000000000e+02 5.035500000000000392e-02
6.000000000000000000e+02 4.036500000000000504e-02
6.100000000000000000e+02 3.078000000000000180e-02
6.200000000000000000e+02 2.214000000000000343e-02
6.300000000000000000e+02 1.444499999999999951e-02
6.400000000000000000e+02 9.450000000000000067e-03
6.500000000000000000e+02 5.669999999999999693e-03
6.600000000000000000e+02 3.105000000000000121e-03
6.700000000000000000e+02 1.619999999999999912e-03
6.800000000000000000e+02 8.099999999999999561e-04
6.900000000000000000e+02 4.049999999999999781e-04
7.000000000000000000e+02 1.350000000000000288e-04
7.100000000000000000e+02 0.000000000000000000e+00
7.200000000000000000e+02 0.000000000000000000e+00
7.300000000000000000e+02 0.000000000000000000e+00
2 changes: 1 addition & 1 deletion common/data/PMTs/pmt_Hamamatsu_R7081.dat
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"jName": "pmt_Hamamatsu_R7081",
"jFrontalShape": "TwoEllipses",
"jDefaultQEFileName": "../common/data/PMTs/measurement_matching_data/QE/DOM_Hamamatsu_R7081_mean_QE.dat",
"jDefaultQEFileName": "../common/data/PMTs/measurement_matching_data/QE/DOM_Hamamatsu_R7081_QE.dat",
"jAbsorbedFractionFileName": "../common/data/PMTs/measurement_matching_data/QE/DOM_Hamamatsu_R7081_CT_intrinsic_QE.dat",
"jCEweightsFileName": "../common/data/PMTs/measurement_matching_data/CE_weight/241011_PDOM.dat",
"jScanDataPath" : "../common/data/PMTs/measurement_matching_data/scans/pDOM/",
Expand Down
179 changes: 179 additions & 0 deletions common/data/PMTs/pmt_Hamamatsu_R7081_HQE.dat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
{
"jName": "pmt_Hamamatsu_R7081_HQE",
"jFrontalShape": "TwoEllipses",
"jDefaultQEFileName": "../common/data/PMTs/measurement_matching_data/QE/pDOM_Hamamatsu_R7081_HQE.dat",
"jAbsorbedFractionFileName": "../common/data/PMTs/measurement_matching_data/QE/DOM_Hamamatsu_R7081_CT_intrinsic_QE.dat",
"jCEweightsFileName": "../common/data/PMTs/measurement_matching_data/CE_weight/241011_PDOM.dat",
"jScanDataPath" : "../common/data/PMTs/measurement_matching_data/scans/pDOM/",
"jScannedWavelengths": [459],
"jResponseData" : "R7081",
"jBulbBackShape": "FullFit",
"jDynodeCADZ0": {
"jValue": 54.2,
"jUnit": "mm"
},
"jDynodeCADOffsetFromTip": {
"jValue": 186,
"jUnit": "mm"
},
"jDynodeCADscale": {
"jValue": 1.5,
"jUnit": "NULL"
},
"jOuterShape": {
"jTotalLenght": {
"jValue": 245,
"jUnit": "mm"
},
"jTubeWidth": {
"jValue": 84.5,
"jUnit": "mm"
},
"jOutRad": {
"jValue": 136.7,
"jUnit": "mm"
},
"jEllipseXYaxis": {
"jValue": 126.69171124385677,
"jUnit": "mm"
},
"jEllipseZaxis": {
"jValue": 72.4703506676762,
"jUnit": "mm"
},
"jSphereEllipseTransition_r": {
"jValue": 19.37386673980471,
"jUnit": "mm"
},
"jSpherePos_y": {
"jValue": 45.18954581791073,
"jUnit": "mm"
},
"jEllipsePos_y": {
"jValue": 88.54628807096132,
"jUnit": "mm"
},
"jLineFitSlope": {
"jValue": 0.5959566004457586,
"jUnit": "mm"
},
"jEllipseConeTransition_x": {
"jValue": 108.6828254994362,
"jUnit": "mm"
},
"jEllipseConeTransition_y": {
"jValue": 51.29784719703635,
"jUnit": "mm"
},
"jConeTorusTransition_x": {
"jValue": 50.7047047047047,
"jUnit": "mm"
},
"jTorusCircleR": {
"jValue": 21.298643548638292,
"jUnit": "mm"
},
"jTorusCirclePos_x": {
"jValue": 63.66788494598223,
"jUnit": "mm"
},
"jTorusCirclePos_y": {
"jValue": 0.1550224756899608,
"jUnit": "mm"
},
"jTorusTubeTransition_y": {
"jValue": 10.7,
"jUnit": "mm"
},
"jEllipseXYaxis_2": {
"jValue": 130.3237890625379,
"jUnit": "mm"
},
"jEllipseZaxis_2": {
"jValue": 133.93453986058813,
"jUnit": "mm"
},
"jEllipsePos_y_2": {
"jValue": 48.07901014408465,
"jUnit": "mm"
}
},
"jInnerShape": {
"jTotalLenght": {
"jValue": 241.0,
"jUnit": "mm"
},
"jTubeWidth": {
"jValue": 80.5,
"jUnit": "mm"
},
"jOutRad": {
"jValue": 134.7,
"jUnit": "mm"
},
"jEllipseXYaxis": {
"jValue": 124.65432835239586,
"jUnit": "mm"
},
"jEllipseZaxis": {
"jValue": 70.56219113574672,
"jUnit": "mm"
},
"jSphereEllipseTransition_r": {
"jValue": 25.695050588425033,
"jUnit": "mm"
},
"jSpherePos_y": {
"jValue": 45.07733034206341,
"jUnit": "mm"
},
"jEllipsePos_y": {
"jValue": 88.53162519399541,
"jUnit": "mm"
},
"jLineFitSlope": {
"jValue": 0.5959566004457586,
"jUnit": "mm"
},
"jEllipseConeTransition_x": {
"jValue": 106.69478340869784,
"jUnit": "mm"
},
"jEllipseConeTransition_y": {
"jValue": 52.387926295016385,
"jUnit": "mm"
},
"jConeTorusTransition_x": {
"jValue": 50.73473473473474,
"jUnit": "mm"
},
"jTorusCircleR": {
"jValue": 23.295649984708234,
"jUnit": "mm"
},
"jTorusCirclePos_x": {
"jValue": 63.634297167732754,
"jUnit": "mm"
},
"jTorusCirclePos_y": {
"jValue": 0.20633211099456134,
"jUnit": "mm"
},
"jTorusTubeTransition_y": {
"jValue": 10.7,
"jUnit": "mm"
},
"jEllipseXYaxis_2": {
"jValue": 127.75822777875737,
"jUnit": "mm"
},
"jEllipseZaxis_2": {
"jValue": 130.68899765944818,
"jUnit": "mm"
},
"jEllipsePos_y_2": {
"jValue": 49.285427136180324,
"jUnit": "mm"
}
}
}
4 changes: 2 additions & 2 deletions common/framework/src/OMSim.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ void OMSim::setGeneralOptions()
("efficiency_cut", po::bool_switch(), "if given, the photons will be deleted if they don't pass QE")
("pmt_response", po::bool_switch(), "if given, simulates PMT response using scan data (currently only for mDOM PMT)")
("place_harness",po::bool_switch(),"place OM harness (if implemented)")
("detector_type", po::value<G4int>()->default_value(2), "module type [custom = 0, Single PMT = 1, mDOM = 2, pDDOM = 3, LOM16 = 4], LOM18 = 4]")
("detector_type", po::value<G4int>()->default_value(2), "module type [custom = 0, Single PMT = 1, mDOM = 2, DOM = 3, LOM16 = 4, LOM18 = 5, DEGG = 6, pDOM (HQE deepcore) = 7]")
("check_overlaps", po::bool_switch()->default_value(false), "check overlaps between volumes during construction")
("glass", po::value<G4int>()->default_value(0), "DEPRECATED. Index to select glass type [VITROVEX = 0, Chiba = 1, Kopp = 2, myVitroVex = 3, myChiba = 4, WOMQuartz = 5, fusedSilica = 6]")
("gel", po::value<G4int>()->default_value(1), "DEPRECATED. Index to select gel type [Wacker = 0, Chiba = 1, IceCube = 2, Wacker_company = 3]")
("reflective_surface", po::value<G4int>()->default_value(0), "DEPRECATED. Index to select reflective surface type [Surf_V95Gel = 0, Surf_V98Gel = 1, Surf_Aluminium = 2, Surf_Total98 = 3]")
("pmt_model", po::value<G4int>()->default_value(0), "DEPRECATED. R15458 (mDOM) = 0, R7081 (DOM) = 1, 4inch (LOM) = 2, R5912_20_100 (D-Egg)= 3")
("pmt_model", po::value<G4int>()->default_value(0), "DEPRECATED. R15458 (mDOM) = 0, R7081 (DOM) = 1, 4inch (LOM) = 2, R5912_20_100 (D-Egg)= 3, R7081_HQE (pDOM) = 4")
("threads", po::value<int>()->default_value(1), "number of threads to use.");
}

Expand Down
14 changes: 7 additions & 7 deletions common/geometry_construction/include/OMSimPDOM.hh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* @file OMSimPDOM.hh
* @brief Implementation of the pDOM/Gen1 DOM class.
* @brief Implementation of the pDOM (deepcore) or Gen1 DOM..
* @ingroup common
*/
#pragma once
Expand All @@ -9,21 +9,21 @@
#include "OMSimOpticalModule.hh"

/**
* @class pDOM
* @brief pDOM class represents the construction of pDOM/Gen1 DOM.
* @class DOM
* @brief DOM class represents the construction of pDOM (deepcore) or Gen1 DOM.
* @ingroup common
*/
class pDOM : public OMSimOpticalModule
class DOM : public OMSimOpticalModule
{
public:
pDOM(G4bool pPlaceHarness = true);
~pDOM(){};
DOM(G4bool p_placeHarness = true, G4bool p_deepcore = false);
~DOM(){};
void construction();
G4bool m_placeHarness;
G4String getName()
{
std::stringstream ss;
ss << "/pDOM/" << m_index;
ss << "/DOM/" << m_index;
return ss.str();
}
double getPressureVesselWeight() {return 9.07*kg;};
Expand Down
6 changes: 3 additions & 3 deletions common/geometry_construction/src/OMSimPDOM.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
#include <G4Orb.hh>
#include <G4Polycone.hh>

pDOM::pDOM(G4bool p_placeHarness): OMSimOpticalModule(new OMSimPMTConstruction()), m_placeHarness(p_placeHarness)
DOM::DOM(G4bool p_placeHarness, G4bool p_deepcore): OMSimOpticalModule(new OMSimPMTConstruction()), m_placeHarness(p_placeHarness)
{
log_info("Constructing pDOM");
m_managerPMT->selectPMT("pmt_Hamamatsu_R7081");
(p_deepcore) ? m_managerPMT->selectPMT("pmt_Hamamatsu_R7081_HQE") : m_managerPMT->selectPMT("pmt_Hamamatsu_R7081");
m_managerPMT->construction();
construction();
}


void pDOM::construction()
void DOM::construction()
{
m_components.clear();

Expand Down
2 changes: 1 addition & 1 deletion common/geometry_construction/src/OMSimPMTConstruction.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ void OMSimPMTConstruction::selectPMT(G4String p_selectedPMT)
{
if (p_selectedPMT.substr(0, 6) == "argPMT")
{
const G4String listPMT[] = {"pmt_Hamamatsu_R15458_CT", "pmt_Hamamatsu_R7081", "pmt_Hamamatsu_4inch", "pmt_Hamamatsu_R5912_20_100"};
const G4String listPMT[] = {"pmt_Hamamatsu_R15458_CT", "pmt_Hamamatsu_R7081", "pmt_Hamamatsu_4inch", "pmt_Hamamatsu_R5912_20_100", "pmt_Hamamatsu_R7081_HQE"};
p_selectedPMT = listPMT[OMSimCommandArgsTable::getInstance().get<G4int>("pmt_model")];
}

Expand Down
7 changes: 6 additions & 1 deletion simulations/effective_area/src/OMSimEffectiveAreaDetector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void OMSimEffectiveAreaDetector::constructDetector()
case 3:
{

opticalModule = new pDOM(placeHarness);
opticalModule = new DOM(placeHarness);
break;
}
case 4:
Expand All @@ -85,6 +85,11 @@ void OMSimEffectiveAreaDetector::constructDetector()
opticalModule = new DEGG(placeHarness);
break;
}
case 7:
{
opticalModule = new DOM(placeHarness, true);
break;
}
}

if (opticalModule)
Expand Down
7 changes: 6 additions & 1 deletion simulations/efficiency_calibration/src/OMSimEffCaliDetector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void OMSimEffiCaliDetector::constructDetector()
case 3:
{

opticalModule = new pDOM(placeHarness);
opticalModule = new DOM(placeHarness);
break;
}
case 4:
Expand All @@ -85,6 +85,11 @@ void OMSimEffiCaliDetector::constructDetector()
opticalModule = new DEGG(placeHarness);
break;
}
case 7:
{
opticalModule = new DOM(placeHarness, true);
break;
}
}

if (opticalModule)
Expand Down
7 changes: 6 additions & 1 deletion simulations/radioactive_decays/src/OMSimRadDecaysDetector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void OMSimRadDecaysDetector::constructDetector()
case 3:
{

opticalModule = new pDOM(placeHarness);
opticalModule = new DOM(placeHarness);
break;
}
case 4:
Expand All @@ -78,6 +78,11 @@ void OMSimRadDecaysDetector::constructDetector()
{
opticalModule = new DEGG(placeHarness);
break;
}
case 7:
{
opticalModule = new DOM(placeHarness, true);
break;
}
}

Expand Down
Loading

0 comments on commit 52b5c82

Please sign in to comment.