Skip to content

Commit

Permalink
fixed mdom
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinunland
martinunland committed Sep 2, 2024
1 parent 1e89506 commit 1418262
Show file tree
Hide file tree
Showing 8 changed files with 319 additions and 5 deletions.
103 changes: 103 additions & 0 deletions common/data/PMTs/measurement_matching_data/setup_stuff/4inch_used_z_compensation.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
#r(mm) z(mm)
0.0 0.0
0.5122223582810871 0.032797491301174375
1.0244447165621742 0.07855562812378736
1.5366670748432614 0.11451307812074418
2.0488894331243483 0.16241203821753203
2.5611117914054353 0.18079146514519095
3.0733341496865227 0.20381500260698004
3.5855565079676097 0.2619280175690406
4.097778866248697 0.32484867775240645
4.610001224529784 0.3728867164013394
5.122223582810871 0.4075627386437475
5.634445941091958 0.421551034101725
6.1466682993730455 0.4679953171752089
6.6588906576541325 0.5230881447589937
7.171113015935219 0.6224093934330313
7.683335374216306 0.6622977373207632
8.195557732497393 0.7296993001447802
8.707780090778481 0.80038876259934
9.220002449059567 0.8658103324636031
9.732224807340655 0.9571591692025976
10.244447165621741 1.0580910183915648
10.75666952390283 1.107358223616906
11.268891882183915 1.248822189259478
11.781114240465003 1.3013637872476735
12.293336598746091 1.4079755514950705
12.805558957027177 1.4875553309745086
13.317781315308265 1.6188417149158596
13.830003673589351 1.719615964546442
14.342226031870439 1.7895713122734733
14.854448390151525 1.9180234509773726
15.366670748432613 1.9713858128622235
15.878893106713699 2.1657805925465254
16.391115464994787 2.2982553672951838
16.903337823275873 2.3737696133416932
17.415560181556963 2.5236912888101557
17.92778253983805 2.6028903523858062
18.440004898119135 2.8072418589023016
18.95222725640022 3.019023363308982
19.46444961468131 3.1300175647291155
19.976671972962396 3.2415972288692174
20.488894331243483 3.439708394142592
21.001116689524572 3.6447741600545314
21.51333904780566 3.799255228095941
22.025561406086744 4.03368944870514
22.53778376436783 4.181956590458309
23.05000612264892 4.409097829365315
23.562228480930006 4.51486110754804
24.074450839211092 4.7779573908576225
24.586673197492182 4.909945300810314
25.098895555773268 5.204550995929978
25.611117914054354 5.363779809912899
26.12334027233544 5.693598797743984
26.63556263061653 5.825156446367046
27.147784988897616 6.1376291814636375
27.660007347178702 6.2690262044151055
28.172229705459788 6.617053716745751
28.684452063740878 6.733105228109348
29.196674422021964 7.085870966790736
29.70889678030305 7.262551189178289
30.22111913858414 7.60514676144475
30.733341496865226 7.970318549655829
31.24556385514631 8.100812718400817
31.757786213427398 8.461209854129983
32.27000857170849 8.61598229162449
32.782230929989574 9.015818632780377
33.29445328827066 9.448400615717691
33.806675646551746 9.829548131252608
34.31889800483283 10.157898953246423
34.831120363113925 10.408951197855153
35.34334272139501 10.671989104079877
35.8555650796761 10.940778475918876
36.36778743795718 11.21772755834629
36.88000979623827 11.505830899617877
37.392232154519355 12.028958386879324
37.90445451280044 12.282480394070078
38.416676871081535 12.786296099392331
38.92889922936262 12.991601527684761
39.44112158764371 13.532576121722407
39.95334394592479 13.786508036106824
40.46556630420588 14.247106737591576
40.977788662486965 14.61996663054321
41.49001102076805 15.054034283651909
42.002233379049144 15.485385823926045
42.51445573733023 15.89748977977635
43.02667809561132 16.38123970197842
43.5389004538924 16.762313974929828
44.05112281217349 17.269241715253546
44.563345170454575 17.658202771530462
45.07556752873566 18.227635999146614
45.587789887016754 18.744434974857956
46.10001224529784 19.281308357704063
46.612234603578926 19.867476827947613
47.12445696186001 20.342786728737835
47.6366793201411 20.807366533458737
48.148901678422185 21.44535783063091
48.66112403670327 21.891623533286435
49.173346394984364 22.43659980629903
49.68556875326545 23.31727996079823
50.197791111546536 23.98413698497753
50.71001346982762 24.613949885979153
51.0 24.613949885979153
200.0 24.613949885979153
103 changes: 103 additions & 0 deletions common/data/PMTs/measurement_matching_data/setup_stuff/DEGG_used_z_compensation.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
#r(mm) z(mm)
0.0 0.0
0.9870505050505051 0.060935002206633726
1.9741010101010101 0.12187000441326745
2.9611515151515153 0.1627889313608364
3.9482020202020203 0.19505968436482135
4.935252525252525 0.240594670699096
5.922303030303031 0.29416128321514634
6.909353535353535 0.32866862306099165
7.8964040404040405 0.3655461345565527
8.883454545454546 0.45483702887912614
9.87050505050505 0.5179154523573004
10.857555555555555 0.5767030708857419
11.844606060606061 0.6943678246910281
12.831656565656566 0.8352969936800037
13.81870707070707 0.9605799226982015
14.805757575757577 1.0945258759354886
15.792808080808081 1.260996104518199
16.779858585858587 1.3691396865433205
17.766909090909092 1.4772832685684705
18.753959595959596 1.6824756393671692
19.7410101010101 1.8696860075069424
20.728060606060605 2.009031306108824
21.71511111111111 2.1931581722581655
22.702161616161618 2.4353460148786326
23.689212121212122 2.58932308246699
24.676262626262627 2.7433001500552905
25.66331313131313 2.9719978931898368
26.650363636363636 3.1812887681934114
27.63741414141414 3.3831840103424042
28.62446464646465 3.630039908252428
29.611515151515153 3.884938906864818
30.598565656565658 4.077712825166827
31.585616161616162 4.270486743468837
32.57266666666667 4.629180711208392
33.559717171717175 4.882098285970869
34.54676767676768 5.125632959215437
35.533818181818184 5.499490344030846
36.52086868686869 5.848394187611291
37.50791919191919 6.11430081246624
38.4949696969697 6.416329171015093
39.4820202020202 6.80772371118934
40.469070707070706 7.1003440305065055
41.45612121212121 7.3929643498237
42.443171717171715 7.838781013038044
43.43022222222222 8.222098947793825
44.41727272727273 8.56008180569512
45.404323232323236 8.964359004301002
46.39137373737374 9.414568807893914
47.378424242424245 9.734662213959268
48.36547474747475 10.057101800153873
49.352525252525254 10.621613148514655
50.33957575757576 11.045198547752022
51.32662626262626 11.43894489609491
52.31367676767677 11.961267679897134
53.30072727272727 12.497110845185574
54.28777777777778 12.922177925783046
55.27482828282828 13.382443374272157
56.261878787878786 14.013296868273613
57.2489292929293 14.471799873158545
58.2359797979798 14.927980894976145
59.223030303030306 15.580960217015189
60.21008080808081 16.176273249553077
61.197131313131315 16.677816809954834
62.18418181818182 17.25761758077016
63.171232323232324 17.98603167586026
64.15828282828284 18.66144438639907
65.14533333333334 19.309434366689175
66.13238383838384 19.90412852929029
67.11943434343435 20.80520105847114
68.10648484848485 21.656556522749753
69.09353535353536 22.200131281048783
70.08058585858586 22.918831347319554
71.06763636363637 24.029922682005946
72.05468686868687 24.66809266472353
73.04173737373738 25.26940573866088
74.02878787878788 26.45930906231675
75.01583838383839 27.42303244881839
76.00288888888889 28.09723195596021
76.9899393939394 29.079382556931648
77.9769898989899 30.354291410201597
78.9640404040404 31.072643275919262
79.95109090909091 31.82352607787641
80.93814141414141 33.18290597897308
81.92519191919192 34.26336858178621
82.91224242424242 35.23393824150344
83.89929292929293 36.652292753690574
84.88634343434343 37.9995933291552
85.87339393939394 39.396576136157535
86.86044444444444 40.86339891526188
87.84749494949494 42.20712891969333
88.83454545454546 43.74801176465189
89.82159595959597 45.219329984477866
90.80864646464647 46.96855754138954
91.79569696969698 48.95935366717234
92.78274747474748 51.0761111511022
93.76979797979799 53.39600116901045
94.75684848484849 56.28125805087339
95.743898989899 59.13450413683623
96.7309494949495 60.0
97.718 60.0
101.0 60.0
200.0 60.0
102 changes: 102 additions & 0 deletions common/data/PMTs/measurement_matching_data/setup_stuff/DOM_used_z_compensation.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
#r(mm) z(mm)
0.41653607085629574 0.025912208170317166
1.6902896250328043 0.0
2.964043179209313 0.0064425023499605875
4.237796733385822 0.040070240498667184
5.51155028756233 0.09571373972458797
6.7853038417388385 0.16820352530619476
8.059057395915348 0.23830464500919252
9.332810950091856 0.32970730162233264
10.606564504268365 0.4254295205818258
11.880318058444873 0.5160861073303697
13.154071612621381 0.6444000807140856
14.42782516679789 0.78206945117598
15.7015787209744 0.963283535379059
16.975332275150908 1.1238709655346044
18.249085829327417 1.3013519777486364
19.522839383503925 1.5036863066732802
20.796592937680433 1.6918451081010397
22.07034649185694 1.9021354559448678
23.34410004603345 2.110520628251108
24.61785360020996 2.3329187100616364
25.891607154386467 2.593541906348604
27.165360708562975 2.8512548338896506
28.439114262739484 3.1710945837410103
29.712867816915992 3.4591840802887224
30.986621371092504 3.761797515407873
32.26037492526901 4.096174476088826
33.53412847944552 4.433799936038451
34.80788203362203 4.798893452199922
36.08163558779854 5.163066200876162
37.355389141975046 5.546461314554254
38.629142696151554 5.934549362531761
39.90289625032806 6.3450019222577625
41.17664980450457 6.75971496155618
42.45040335868108 7.192421143467905
43.72415691285759 7.6366046450882985
44.997910467034096 8.107353942418769
46.271664021210604 8.57932469463281
47.54541757538711 9.103112733739852
48.81917112956362 9.636148773321123
50.09292468374013 10.178284348567333
51.36667823791664 10.727169518295495
52.640431792093146 11.300182790770384
53.914185346269655 11.891804361395401
55.18793890044616 12.513339005266152
56.46169245462267 13.135771622951665
57.73544600879918 13.755603899805202
59.00919956297569 14.398685766452848
60.282953117152196 15.085125049102702
61.55670667132871 15.773776972868596
62.83046022550522 16.475876474642885
64.10421377968173 17.18735791140938
65.37796733385824 17.936990992287217
66.65172088803475 18.709863750999485
67.92547444221125 19.510492138261107
69.19922799638776 20.323350855181822
70.47298155056427 21.13816101075008
71.74673510474078 21.988073178520278
73.02048865891729 22.884287347668337
74.2942422130938 23.77822132594054
75.5679957672703 24.686283422283736
76.84174932144681 25.625549628709674
78.11550287562332 26.598350918471212
79.38925642979983 27.61138686215447
80.66300998397634 28.651578634616943
81.93676353815285 29.69425879296677
83.21051709232935 30.771576711282695
84.48427064650586 31.894682291672176
85.75802420068237 33.03912833850098
87.03177775485888 34.17817938098499
88.30553130903539 35.37121620310492
89.5792848632119 36.61167607922258
90.8530384173884 37.87684010116305
92.12679197156491 39.20736156747444
93.40054552574142 40.56064268562697
94.67429907991793 41.95219615370184
95.94805263409444 43.40322147939709
97.22180618827095 44.861838614853355
98.49555974244745 46.288980640019034
99.76931329662396 47.70166163046571
101.04306685080047 49.083814928318354
102.31682040497698 50.42788549389739
103.59057395915349 51.74042145294523
104.86432751333 53.061126938957194
106.1380810675065 54.34926258568435
107.41183462168301 55.66682821298772
108.68558817585952 56.95758504368394
109.95934173003603 58.260228309648056
111.23309528421254 59.54564109593031
112.50684883838905 60.0
113.78060239256556 60.0
115.05435594674206 60.0
116.32810950091857 60.0
117.60186305509508 60.0
118.87561660927159 60.0
120.1493701634481 60.0
121.4231237176246 60.0
122.69687727180113 60.0
123.97063082597764 60.0
125.24438438015414 60.0
126.51813793433064 60.0
200.0 60.0
0 ...on/data/PMTs/pmt_Hamamatsu_R15458_CAT.dat → common/data/PMTs/pmt_Hamamatsu_R15458_CT.dat
View file
File renamed without changes.
9 changes: 7 additions & 2 deletions common/geometry_construction/src/OMSimPMTConstruction.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,12 +400,17 @@ G4UnionSolid *OMSimPMTConstruction::doubleEllipsePhotocathode(G4String p_side)
G4double ellipseZAxis2 = m_data->getValueWithUnit(m_selectedPMT, p_side + ".jEllipseZaxis_2");
G4double ellipseYpos2 = m_data->getValueWithUnit(m_selectedPMT, p_side + ".jEllipsePos_y_2");

G4double ellipseEllipseTransitionY = m_ellipsePosY;
if(m_data->checkIfKeyInTree(m_selectedPMT, p_side + ".jEllipseEllipseTransition_y"))
{
ellipseEllipseTransitionY = m_data->getValueWithUnit(m_selectedPMT, p_side + ".jEllipseEllipseTransition_y");
}


G4Ellipsoid *bulbEllipsoid = new G4Ellipsoid("Solid Bulb Ellipsoid", m_ellipseXYaxis, m_ellipseXYaxis, m_ellipseZaxis);
G4Ellipsoid *bulbEllipsoid2 = new G4Ellipsoid("Solid Bulb Ellipsoid 2", ellipseXYAxis2, ellipseXYAxis2, ellipseZAxis2);
G4cout << m_ellipsePosY << " " << ellipseYpos2 << G4endl;

G4double excess = m_ellipsePosY-ellipseYpos2;
G4double excess = ellipseEllipseTransitionY-ellipseYpos2;

G4Tubs *substractionTube = new G4Tubs("substracion_tube_large_ellipsoid", 0.0, ellipseXYAxis2 * 3, ellipseZAxis2, 0, 2 * CLHEP::pi);
G4SubtractionSolid *substractedLargeEllipsoid = new G4SubtractionSolid("Substracted Bulb Ellipsoid 2", bulbEllipsoid2,
Expand Down
4 changes: 2 additions & 2 deletions simulations/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
add_subdirectory(effective_area)
#add_subdirectory(effective_area)
#add_subdirectory(radioactive_decays)
#add_subdirectory(supernova)
#add_subdirectory(efficiency_calibration)
add_subdirectory(efficiency_calibration)
2 changes: 1 addition & 1 deletion simulations/efficiency_calibration/OMSim_efficiency_calibration.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void runXYZfrontalScan()
hitManager.reset();
}
}

scanner->runBeamPicoQuantSetup(40, 40);
}


Expand Down
1 change: 1 addition & 0 deletions simulations/efficiency_calibration/src/OMSimEffCaliDetector.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ void OMSimEffiCaliDetector::constructDetector()
managerPMT->placeIt(G4ThreeVector(0, 0, 0), G4RotationMatrix(), m_worldLogical, "_0");
hitManager.setNumberOfPMTs(1, 0);
managerPMT->configureSensitiveVolume(this, "/PMT/0");
log_info("aijdpoijdspogijrdspog {}", managerPMT->getDistancePMTCenterToTip());
break;
}
case 2:
Expand Down

0 comments on commit 1418262

Please sign in to comment.