Skip to content

Commit e088a5d

Browse files
MarkusDittmerMarkusDittmer
committed
Reverted Vitrovex yield handling (commit c87a047) and swap scintillation file
1 parent 746f1ba commit e088a5d

5 files changed

Lines changed: 5072 additions & 193 deletions

File tree

‎common/data/scintillation/Scint_Vitrovex.dat‎

Lines changed: 147 additions & 148 deletions
Original file line numberDiff line numberDiff line change
@@ -136,154 +136,153 @@
136136
}
137137
},
138138
"jYieldAlphaTemperature": [
139-
-49.6827135135,
140-
-48.6981,
141-
-47.765261828,
142-
-46.7357361823,
143-
-45.7603202614,
144-
-44.6141313333,
145-
-43.6917292517,
146-
-42.5353875433,
147-
-41.6170146341,
148-
-40.4780298932,
149-
-39.5647677419,
150-
-38.4654438163,
151-
-37.5642509677,
152-
-36.523295082,
153-
-35.5229577061,
154-
-34.4256498221,
155-
-33.5305238434,
156-
-32.4345929078,
157-
-31.5537056338,
158-
-30.4643148789,
159-
-29.5869496552,
160-
-28.448294375,
161-
-27.6114601156,
162-
-26.4902623037,
163-
-25.6996692506,
164-
-24.6031675978,
165-
-23.7338738889,
166-
-22.654701087,
167-
-21.7798224,
168-
-20.7099168901,
169-
-19.8336268097,
170-
-18.7613044386,
171-
-17.9003142857,
172-
-16.8079797647,
173-
-15.9890587973
174-
],
175-
"jYieldAlpha": [
176-
125.51292617553742,
177-
124.36761970900005,
178-
124.18365416184061,
179-
123.57342964701763,
180-
122.89212532211975,
181-
121.95183522555963,
182-
120.29868625215552,
183-
119.20904541441357,
184-
118.70274935446561,
185-
117.35964168265492,
186-
116.08620514872416,
187-
114.67661501986173,
188-
113.1159993682205,
189-
110.79482585820176,
190-
109.01509936564648,
191-
107.75193517932924,
192-
106.72236383149604,
193-
105.48017664725492,
194-
103.90637873790979,
195-
102.04424258882166,
196-
100.8247454101702,
197-
99.02871792171466,
198-
97.8040530109855,
199-
96.52424932398574,
200-
95.53854758517515,
201-
93.74998133830238,
202-
92.42975273830957,
203-
91.22836703578858,
204-
89.99357798096582,
205-
88.24339096509071,
206-
87.05742061017511,
207-
85.75824452386817,
208-
84.53198850990744,
209-
82.70174233138988,
210-
81.67897756419144
139+
-49.6827135135,
140+
-48.6981,
141+
-47.765261828,
142+
-46.7357361823,
143+
-45.7603202614,
144+
-44.6141313333,
145+
-43.6917292517,
146+
-42.5353875433,
147+
-41.6170146341,
148+
-40.4780298932,
149+
-39.5647677419,
150+
-38.4654438163,
151+
-37.5642509677,
152+
-36.523295082,
153+
-35.5229577061,
154+
-34.4256498221,
155+
-33.5305238434,
156+
-32.4345929078,
157+
-31.5537056338,
158+
-30.4643148789,
159+
-29.5869496552,
160+
-28.448294375,
161+
-27.6114601156,
162+
-26.4902623037,
163+
-25.6996692506,
164+
-24.6031675978,
165+
-23.7338738889,
166+
-22.654701087,
167+
-21.7798224,
168+
-20.7099168901,
169+
-19.8336268097,
170+
-18.7613044386,
171+
-17.9003142857,
172+
-16.8079797647,
173+
-15.9890587973
174+
],
175+
"jYieldAlpha": [
176+
169.65375901805115,
177+
168.22475364773635,
178+
168.0885718515632,
179+
167.3863269168956,
180+
166.5800409714628,
181+
165.4414154405034,
182+
163.3066447087526,
183+
161.96150221580768,
184+
161.37964652582644,
185+
159.683649666249,
186+
158.05406886644656,
187+
156.25747902524893,
188+
154.23013206596875,
189+
151.17744536635993,
190+
148.85509516382544,
191+
147.24528819859748,
192+
145.93126016005806,
193+
144.34512389796873,
194+
142.28046130532823,
195+
139.8387211548352,
196+
138.25358206611656,
197+
135.90047991965767,
198+
134.2994256060164,
199+
132.64731256910957,
200+
131.3661785451481,
201+
129.00685739930327,
202+
127.26826493117467,
203+
125.709798127364,
204+
124.08486624178921,
205+
121.76349067369652,
206+
120.20120773361128,
207+
118.49685155445813,
208+
116.87324635428975,
209+
114.43061640565371,
210+
113.08051278939719
211+
],
212+
"jYieldElectronTemperature": [
213+
-49.6827135135,
214+
-48.6981,
215+
-47.765261828,
216+
-46.7357361823,
217+
-45.7603202614,
218+
-44.6141313333,
219+
-43.6917292517,
220+
-42.5353875433,
221+
-41.6170146341,
222+
-40.4780298932,
223+
-39.5647677419,
224+
-38.4654438163,
225+
-37.5642509677,
226+
-36.523295082,
227+
-35.5229577061,
228+
-34.4256498221,
229+
-33.5305238434,
230+
-32.4345929078,
231+
-31.5537056338,
232+
-30.4643148789,
233+
-29.5869496552,
234+
-28.448294375,
235+
-27.6114601156,
236+
-26.4902623037,
237+
-25.6996692506,
238+
-24.6031675978,
239+
-23.7338738889,
240+
-22.654701087,
241+
-21.7798224,
242+
-20.7099168901,
243+
-19.8336268097,
244+
-18.7613044386,
245+
-17.9003142857,
246+
-16.8079797647,
247+
-15.9890587973
248+
],
249+
"jYieldElectron": [
250+
305.78856233912734,
251+
302.7391252712001,
252+
302.0455678812675,
253+
300.2907738902409,
254+
298.37955366621145,
255+
295.79766016476833,
256+
291.5499900102314,
257+
288.6128455399738,
258+
287.1520819930216,
259+
283.61408576542965,
260+
280.30692781544536,
261+
276.6293739081418,
262+
272.6427268063495,
263+
266.7961798165052,
264+
262.2718193680947,
265+
258.9733190986313,
266+
256.28859826884184,
267+
253.05051398981166,
268+
249.07248531521574,
269+
244.36231307651147,
270+
241.24540562481582,
271+
236.69675961752105,
272+
233.58676502989022,
273+
230.28786247136202,
274+
227.76664078093253,
275+
223.27138068221313,
276+
219.94597157246164,
277+
216.864590726639,
278+
213.7508821296871,
279+
209.3794194542168,
280+
206.3917111786546,
281+
203.10180228589095,
282+
200.03115167399852,
283+
195.4930170628301,
284+
192.92163382563177
211285
],
212-
"jYieldElectronTemperature": [
213-
-50.0,
214-
-49.0,
215-
-48.0,
216-
-47.0,
217-
-46.0,
218-
-45.0,
219-
-44.0,
220-
-43.0,
221-
-42.0,
222-
-41.0,
223-
-40.0,
224-
-39.0,
225-
-38.0,
226-
-37.0,
227-
-36.0,
228-
-35.0,
229-
-34.0,
230-
-33.0,
231-
-32.0,
232-
-31.0,
233-
-30.0,
234-
-29.0,
235-
-28.0,
236-
-27.0,
237-
-26.0,
238-
-25.0,
239-
-24.0,
240-
-23.0,
241-
-22.0,
242-
-21.0,
243-
-20.0,
244-
-19.0,
245-
-18.0,
246-
-17.0,
247-
-16.0,
248-
-15.0
249-
],
250-
"jYieldElectron": [
251-
213.3719744984136,
252-
211.4249535053001,
253-
211.11221207512904,
254-
210.07483039992997,
255-
208.91661304760356,
256-
207.31811988345137,
257-
204.50776662866437,
258-
202.65537720450305,
259-
201.79467390259154,
260-
199.51139086051336,
261-
197.34654875283107,
262-
194.95024553376493,
263-
192.29719892597484,
264-
188.351203958943,
265-
185.325668921599,
266-
183.1782898048597,
267-
181.42801851354326,
268-
179.31630030033335,
269-
176.64084385444664,
270-
173.4752124009968,
271-
171.4020671972893,
272-
168.3488204669149,
273-
166.26689011867535,
274-
164.09122385077575,
275-
162.41553089479777,
276-
159.37496827511404,
277-
157.13057965512627,
278-
155.0882239608406,
279-
152.9890825676419,
280-
150.01376464065422,
281-
147.9976150372977,
282-
145.7890156905759,
283-
143.70438046684265,
284-
140.5929619633628,
285-
138.85426185912544
286-
],
287286
"jSpectrumWavelength": [
288287
200.0,
289288
215.0,
@@ -342,4 +341,4 @@
342341
0.0,
343342
0.0
344343
]
345-
}
344+
}

‎common/framework/src/OMSimMaterialHandler.cc‎

Lines changed: 6 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -540,15 +540,6 @@ namespace ScintillationProcessor
540540
void extractYieldAlpha(ParameterTable *p_dataFile, const boost::property_tree::ptree &p_jsonTree, G4MaterialPropertiesTable *p_MPT, G4String p_temperature)
541541
{
542542
extractYield(p_dataFile, p_jsonTree, p_MPT, p_temperature, "SCINTILLATIONYIELD", "yield_alphas", "jYieldAlphaTemperature", "jYieldAlpha");
543-
544-
// Scale the Vitrovex alpha yield by a temperature dependant factor resulting from PMT simulation changes. (See OMSim/documentation/notebooks/scintillation_yield_PMTefficiencyCorrection/GetYieldFactorAndRescale.ipynb).
545-
if (p_jsonTree.get<G4String>("jMaterialName") == "RiAbs_Glass_Vitrovex")
546-
{
547-
log_info("Vitrovex alpha yield will be scaled due to PMT efficiency changes.");
548-
G4double alphaYield = p_MPT->GetConstProperty("SCINTILLATIONYIELD");
549-
alphaYield *= 0.0009725 * std::stod(p_temperature) + 1.40;
550-
p_MPT->AddConstProperty("SCINTILLATIONYIELD", alphaYield, true);
551-
}
552543
}
553544
/**
554545
* @brief Extracts and interpolates the electron scintillation yield for a given temperature.
@@ -560,31 +551,17 @@ namespace ScintillationProcessor
560551
*/
561552
void extractYieldElectron(ParameterTable *p_dataFile, const boost::property_tree::ptree &p_jsonTree, G4MaterialPropertiesTable *p_MPT, G4String p_temperature)
562553
{
563-
// Scale Vitrovex electron yield with the temperature dependant measured electron yield. (See OMSim/documentation/notebooks/scintillation_yield_PMTefficiencyCorrection/GetYieldFactorAndRescale.ipynb).
564-
if (p_jsonTree.get<G4String>("jMaterialName") == "RiAbs_Glass_Vitrovex")
554+
try
565555
{
566-
log_info("Vitrovex electron yield set to alpha yield scaled by electron yield factor.");
567-
568-
G4double alphaYield = p_MPT->GetConstProperty("SCINTILLATIONYIELD");
569-
G4double temperature = std::stod(p_temperature);
570-
G4double electronYield = alphaYield * (-0.0028602 * temperature + 1.66032); //2018 glass batch
571-
572-
p_MPT->AddConstProperty("SCINTILLATIONYIELDELECTRONS", electronYield, true);
573-
log_trace("Alpha yield: {} Electron yield: {}", alphaYield, electronYield);
556+
extractYield(p_dataFile, p_jsonTree, p_MPT, p_temperature, "SCINTILLATIONYIELDELECTRONS", "yield_electrons", "jYieldElectronTemperature", "jYieldElectron");
574557
}
575-
else
558+
catch (...)
576559
{
577-
try
578-
{
579-
extractYield(p_dataFile, p_jsonTree, p_MPT, p_temperature, "SCINTILLATIONYIELDELECTRONS", "yield_electrons", "jYieldElectronTemperature", "jYieldElectron");
580-
}
581-
catch (...)
582-
{
583-
log_warning("Electron yield not found, using alpha yield.");
584-
extractYield(p_dataFile, p_jsonTree, p_MPT, p_temperature, "SCINTILLATIONYIELDELECTRONS", "yield_alphas", "jYieldAlphaTemperature", "jYieldAlpha");
585-
}
560+
log_warning("Electron yield not found, using alpha yield.");
561+
extractYield(p_dataFile, p_jsonTree, p_MPT, p_temperature, "SCINTILLATIONYIELDELECTRONS", "yield_alphas", "jYieldAlphaTemperature", "jYieldAlpha");
586562
}
587563
}
564+
588565
}
589566

590567
/**

0 commit comments

Comments
 (0)