Skip to content

Fix PDE efficiency issue #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jurenag wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix PDE efficiency issue #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2da0ad6
Sort SiPM PDE array
jurenag Feb 16, 2022
42b3841
Add SiPM data within a csv file for future use with Reader
jurenag Feb 16, 2022
947ceef
Add boolean return to OpticalSD::ProcessHits() to prevent runtime seg…
jurenag Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 100 additions & 0 deletions data/SiPM_PDE.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
1.382, 0.035
1.401, 0.039
1.418, 0.044
1.436, 0.048
1.454, 0.053
1.475, 0.059
1.499, 0.066
1.515, 0.071
1.536, 0.076
1.557, 0.082
1.578, 0.088
1.602, 0.096
1.619, 0.101
1.641, 0.108
1.66, 0.114
1.683, 0.122
1.714, 0.132
1.734, 0.139
1.754, 0.145
1.774, 0.152
1.797, 0.159
1.826, 0.169
1.846, 0.176
1.866, 0.183
1.889, 0.191
1.913, 0.2
1.929, 0.206
1.943, 0.211
1.962, 0.219
1.971, 0.225
1.988, 0.233
2.006, 0.241
2.02, 0.247
2.038, 0.252
2.06, 0.259
2.079, 0.266
2.098, 0.273
2.117, 0.28
2.137, 0.289
2.15, 0.293
2.171, 0.3
2.192, 0.308
2.216, 0.315
2.238, 0.323
2.268, 0.333
2.294, 0.341
2.318, 0.348
2.345, 0.356
2.378, 0.365
2.411, 0.373
2.446, 0.381
2.49, 0.387
2.546, 0.393
2.619, 0.398
2.696, 0.401
2.761, 0.398
2.83, 0.392
2.902, 0.385
2.965, 0.377
2.997, 0.37
3.023, 0.367
3.064, 0.36
3.106, 0.352
3.148, 0.345
3.185, 0.335
3.192, 0.329
3.223, 0.323
3.253, 0.312
3.284, 0.302
3.316, 0.29
3.349, 0.278
3.382, 0.267
3.415, 0.256
3.441, 0.245
3.45, 0.239
3.485, 0.234
3.503, 0.225
3.521, 0.217
3.539, 0.209
3.563, 0.2
3.585, 0.19
3.594, 0.182
3.613, 0.176
3.618, 0.17
3.623, 0.163
3.642, 0.154
3.652, 0.143
3.672, 0.135
3.677, 0.13
3.687, 0.119
3.701, 0.108
3.721, 0.099
3.732, 0.09
3.752, 0.08
3.773, 0.068
3.794, 0.055
3.815, 0.046
3.836, 0.037
3.875, 0.026
11.3, 0.0
3 changes: 3 additions & 0 deletions data/readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Regarding the data stored in ./SiPM_PDE.csv :
The first column comprises energy entries in eV.
The second column comprises the photon detection efficiency itself.
65 changes: 32 additions & 33 deletions src/GenericPhotosensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,25 +96,25 @@ void GenericPhotosensor::Construct()

name = "PHOTOSENSOR_OPSURF";

G4double energy[] = {OpticalMaterialProperties::energy_max, 3.875*eV, 3.836*eV, 3.815*eV, 3.794*eV, 3.773*eV,
3.752*eV, 3.732*eV, 3.721*eV, 3.687*eV, 3.701*eV, 3.672*eV,
3.652*eV, 3.672*eV, 3.642*eV, 3.613*eV, 3.623*eV, 3.594*eV,
3.613*eV, 3.585*eV, 3.563*eV, 3.539*eV, 3.521*eV, 3.503*eV,
3.485*eV, 3.441*eV, 3.45*eV, 3.415*eV, 3.382*eV, 3.349*eV,
3.316*eV, 3.284*eV, 3.253*eV, 3.223*eV, 3.185*eV, 3.192*eV,
3.148*eV, 3.106*eV, 3.064*eV, 3.023*eV, 2.997*eV, 2.965*eV,
2.902*eV, 2.83*eV, 2.761*eV, 2.696*eV, 2.619*eV, 2.546*eV,
2.49*eV, 2.446*eV, 2.411*eV, 2.378*eV, 2.345*eV, 2.318*eV,
2.294*eV, 2.268*eV, 2.238*eV, 2.216*eV, 2.192*eV, 2.171*eV,
2.15*eV, 2.137*eV, 2.117*eV, 2.098*eV, 2.079*eV, 2.06*eV,
2.038*eV, 2.02*eV, 2.006*eV, 1.988*eV, 1.971*eV, 1.962*eV,
1.943*eV, 1.929*eV, 1.913*eV, 1.889*eV, 1.866*eV, 1.846*eV,
1.826*eV, 1.797*eV, 1.774*eV, 1.754*eV, 1.734*eV, 1.714*eV,
1.683*eV, 1.66*eV, 1.641*eV, 1.619*eV, 1.602*eV, 1.578*eV,
1.557*eV, 1.536*eV, 1.515*eV, 1.499*eV, 1.475*eV, 1.454*eV,
1.436*eV, 1.418*eV, 1.401*eV, 1.382*eV, OpticalMaterialProperties::energy_min};

G4double reflectivity[] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
G4double energy[] = {1.382*eV, 1.401*eV, 1.418*eV, 1.436*eV, 1.454*eV, 1.475*eV,
1.499*eV, 1.515*eV, 1.536*eV, 1.557*eV, 1.578*eV, 1.602*eV,
1.619*eV, 1.641*eV, 1.66*eV, 1.683*eV, 1.714*eV, 1.734*eV,
1.754*eV, 1.774*eV, 1.797*eV, 1.826*eV, 1.846*eV, 1.866*eV,
1.889*eV, 1.913*eV, 1.929*eV, 1.943*eV, 1.962*eV, 1.971*eV,
1.988*eV, 2.006*eV, 2.02*eV, 2.038*eV, 2.06*eV, 2.079*eV,
2.098*eV, 2.117*eV, 2.137*eV, 2.15*eV, 2.171*eV, 2.192*eV,
2.216*eV, 2.238*eV, 2.268*eV, 2.294*eV, 2.318*eV, 2.345*eV,
2.378*eV, 2.411*eV, 2.446*eV, 2.49*eV, 2.546*eV, 2.619*eV,
2.696*eV, 2.761*eV, 2.83*eV, 2.902*eV, 2.965*eV, 2.997*eV,
3.023*eV, 3.064*eV, 3.106*eV, 3.148*eV, 3.185*eV, 3.192*eV,
3.223*eV, 3.253*eV, 3.284*eV, 3.316*eV, 3.349*eV, 3.382*eV,
3.415*eV, 3.441*eV, 3.45*eV, 3.485*eV, 3.503*eV, 3.521*eV,
3.539*eV, 3.563*eV, 3.585*eV, 3.594*eV, 3.613*eV, 3.618*eV,
3.623*eV, 3.642*eV, 3.652*eV, 3.672*eV, 3.677*eV, 3.687*eV,
3.701*eV, 3.721*eV, 3.732*eV, 3.752*eV, 3.773*eV, 3.794*eV,
3.815*eV, 3.836*eV, 3.875*eV, OpticalMaterialProperties::energy_max};

G4double reflectivity[] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
Expand All @@ -124,22 +124,21 @@ void GenericPhotosensor::Construct()
0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
0.0, 0.0, 0.0, 0.0};

G4double efficiency[] = {0.0, 0.026, 0.037, 0.046, 0.055, 0.068, 0.08, 0.09, 0.099, 0.119,
0.108, 0.13, 0.143, 0.135, 0.154, 0.17, 0.163, 0.182, 0.176,
0.19, 0.2, 0.209, 0.217, 0.225, 0.234, 0.245, 0.239, 0.256,
0.267, 0.278, 0.29, 0.302, 0.312, 0.323, 0.335, 0.329, 0.345,
0.352, 0.36, 0.367, 0.37, 0.377, 0.385, 0.392, 0.398, 0.401,
0.398, 0.393, 0.387, 0.381, 0.373, 0.365, 0.356, 0.348, 0.341,
0.333, 0.323, 0.315, 0.308, 0.3, 0.293, 0.289, 0.28, 0.273,
0.266, 0.259, 0.252, 0.247, 0.241, 0.233, 0.225, 0.219, 0.211,
0.206, 0.2, 0.191, 0.183, 0.176, 0.169, 0.159, 0.152, 0.145,
0.139, 0.132, 0.122, 0.114, 0.108, 0.101, 0.096, 0.088, 0.082,
0.076, 0.071, 0.066, 0.059, 0.053, 0.048, 0.044, 0.039, 0.035, 0.0};

G4double efficiency[] = {0.035, 0.039, 0.044, 0.048, 0.053, 0.059, 0.066, 0.071, 0.076,
0.082, 0.088, 0.096, 0.101, 0.108, 0.114, 0.122, 0.132, 0.139,
0.145, 0.152, 0.159, 0.169, 0.176, 0.183, 0.191, 0.2, 0.206,
0.211, 0.219, 0.225, 0.233, 0.241, 0.247, 0.252, 0.259, 0.266,
0.273, 0.28, 0.289, 0.293, 0.3, 0.308, 0.315, 0.323, 0.333,
0.341, 0.348, 0.356, 0.365, 0.373, 0.381, 0.387, 0.393, 0.398,
0.401, 0.398, 0.392, 0.385, 0.377, 0.37, 0.367, 0.36, 0.352,
0.345, 0.335, 0.329, 0.323, 0.312, 0.302, 0.29, 0.278, 0.267,
0.256, 0.245, 0.239, 0.234, 0.225, 0.217, 0.209, 0.2, 0.19,
0.182, 0.176, 0.17, 0.163, 0.154, 0.143, 0.135, 0.13, 0.119,
0.108, 0.099, 0.09, 0.08, 0.068, 0.055, 0.046, 0.037, 0.026, 0.0};

G4MaterialPropertiesTable* photosensor_mpt = new G4MaterialPropertiesTable();
photosensor_mpt->AddProperty("REFLECTIVITY", energy, reflectivity, 101);
photosensor_mpt->AddProperty("EFFICIENCY", energy, efficiency, 101);
photosensor_mpt->AddProperty("REFLECTIVITY", energy, reflectivity, 100);
photosensor_mpt->AddProperty("EFFICIENCY", energy, efficiency, 100);

G4OpticalSurface* photosensor_opsurf =
new G4OpticalSurface(name, unified, polished, dielectric_metal);
Expand Down
1 change: 1 addition & 0 deletions src/OpticalSD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ void OpticalSD::Initialize(G4HCofThisEvent* hce)

G4bool OpticalSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
{
return false;
}


Expand Down