diff --git a/DDG4/src/Geant4Converter.cpp b/DDG4/src/Geant4Converter.cpp
index fc52e338787ee90ef5d850dae1a11adeb1082d22..967fce18ba9a58a04c8025ae6ca846fea38932dc 100644
--- a/DDG4/src/Geant4Converter.cpp
+++ b/DDG4/src/Geant4Converter.cpp
@@ -266,6 +266,81 @@ namespace {
printout(DEBUG, "Region", "Name:%s", region.name());
}
};
+
+
+ pair<double,double> g4PropertyConversion(int index) {
+ switch(index) {
+ case kRINDEX: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kREFLECTIVITY: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kREALRINDEX: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kIMAGINARYRINDEX: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kEFFICIENCY: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kTRANSMITTANCE: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kSPECULARLOBECONSTANT: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kSPECULARSPIKECONSTANT: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kBACKSCATTERCONSTANT: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kGROUPVEL: return make_pair(CLHEP::keV/units::keV, 1.0); // ??? meter/second ?
+ case kMIEHG: return make_pair(CLHEP::keV/units::keV, CLHEP::m/units::m);
+ case kRAYLEIGH: return make_pair(CLHEP::keV/units::keV, CLHEP::m/units::m); // ??? says its a length
+ case kWLSCOMPONENT: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kWLSABSLENGTH: return make_pair(CLHEP::keV/units::keV, CLHEP::m/units::m);
+ case kABSLENGTH: return make_pair(CLHEP::keV/units::keV, CLHEP::m/units::m);
+ case kFASTCOMPONENT: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kSLOWCOMPONENT: return make_pair(CLHEP::keV/units::keV, 1.0);
+ case kPROTONSCINTILLATIONYIELD: return make_pair(CLHEP::keV/units::keV, units::keV/CLHEP::keV); // Yields: 1/energy
+ case kDEUTERONSCINTILLATIONYIELD: return make_pair(CLHEP::keV/units::keV, units::keV/CLHEP::keV);
+ case kTRITONSCINTILLATIONYIELD: return make_pair(CLHEP::keV/units::keV, units::keV/CLHEP::keV);
+ case kALPHASCINTILLATIONYIELD: return make_pair(CLHEP::keV/units::keV, units::keV/CLHEP::keV);
+ case kIONSCINTILLATIONYIELD: return make_pair(CLHEP::keV/units::keV, units::keV/CLHEP::keV);
+ case kELECTRONSCINTILLATIONYIELD: return make_pair(CLHEP::keV/units::keV, units::keV/CLHEP::keV);
+ default:
+ break;
+ }
+ printout(FATAL,"Geant4Converter", "+++ Cannot convert material property with index: %d", index);
+ return make_pair(0e0,0e0);
+ }
+
+ double g4ConstPropertyConversion(int index) {
+ switch(index) {
+ case kSURFACEROUGHNESS: return 1.0; // ??
+ case kISOTHERMAL_COMPRESSIBILITY: return 1.0; // ??
+ case kRS_SCALE_FACTOR: return 1.0; // ??
+ case kWLSMEANNUMBERPHOTONS: return 1.0; // ??
+ case kWLSTIMECONSTANT: return CLHEP::second/units::second;
+ case kMIEHG_FORWARD: return 1.0;
+ case kMIEHG_BACKWARD: return 1.0;
+ case kMIEHG_FORWARD_RATIO: return 1.0;
+ case kSCINTILLATIONYIELD: return units::keV/CLHEP::keV;
+ case kRESOLUTIONSCALE: return 1.0;
+ case kFASTTIMECONSTANT: return CLHEP::second/units::second;
+ case kFASTSCINTILLATIONRISETIME: return CLHEP::second/units::second;
+ case kSLOWTIMECONSTANT: return CLHEP::second/units::second;
+ case kSLOWSCINTILLATIONRISETIME: return CLHEP::second/units::second;
+ case kYIELDRATIO: return 1.0;
+ case kFERMIPOT: return CLHEP::keV/units::keV;
+ case kDIFFUSION: return 1.0;
+ case kSPINFLIP: return 1.0;
+ case kLOSS: return 1.0; // ??
+ case kLOSSCS: return CLHEP::barn/units::barn; // ??
+ case kABSCS: return CLHEP::barn/units::barn; // ??
+ case kSCATCS: return CLHEP::barn/units::barn; // ??
+ case kMR_NBTHETA: return 1.0;
+ case kMR_NBE: return 1.0;
+ case kMR_RRMS: return 1.0; // ??
+ case kMR_CORRLEN: return CLHEP::m/units::m;
+ case kMR_THETAMIN: return 1.0;
+ case kMR_THETAMAX: return 1.0;
+ case kMR_EMIN: return CLHEP::keV/units::keV;
+ case kMR_EMAX: return CLHEP::keV/units::keV;
+ case kMR_ANGNOTHETA: return 1.0;
+ case kMR_ANGNOPHI: return 1.0;
+ case kMR_ANGCUT: return 1.0;
+ default:
+ break;
+ }
+ printout(FATAL,"Geant4Converter", "+++ Cannot convert CONST material property with index: %d", index);
+ return 0.0;
+ }
}
/// Initializing Constructor
@@ -418,8 +493,23 @@ void* Geant4Converter::handleMaterial(const string& name, Material medium) const
tab = new G4MaterialPropertiesTable();
mat->SetMaterialPropertiesTable(tab);
}
+ int idx = tab->GetPropertyIndex(n->GetName(), false);
+ if ( idx < 0 ) {
+ printout(ERROR, "Geant4Converter", "++ UNKNOWN Geant4 CONST Property: %-20s [IGNORED]", n->GetName());
+ continue;
+ }
+ // We need to convert the property from TGeo units to Geant4 units
+ auto conv = g4PropertyConversion(idx);
+ double* bins = new double[v->bins.size()];
+ double* vals = new double[v->bins.size()];
+ for(size_t i=0, count=v->bins.size(); i<count; ++i) {
+ bins[i] = v->bins[i] * conv.first;
+ vals[i] = v->values[i] * conv.second;
+ }
G4MaterialPropertyVector* vec =
- new G4MaterialPropertyVector(&v->bins[0], &v->values[0], v->bins.size());
+ new G4MaterialPropertyVector(bins, vals, v->bins.size());
+ delete [] bins;
+ delete [] vals;
printout(lvl, "Geant4Converter", "++ Property: %-20s [%ld x %ld] -> %s ",
n->GetName(), matrix->GetRows(), matrix->GetCols(), n->GetTitle());
tab->AddProperty(n->GetName(), vec);
@@ -440,8 +530,15 @@ void* Geant4Converter::handleMaterial(const string& name, Material medium) const
tab = new G4MaterialPropertiesTable();
mat->SetMaterialPropertiesTable(tab);
}
+ int idx = tab->GetConstPropertyIndex(n->GetName(), false);
+ if ( idx < 0 ) {
+ printout(ERROR, "Geant4Converter", "++ UNKNOWN Geant4 CONST Property: %-20s [IGNORED]", n->GetName());
+ continue;
+ }
+ // We need to convert the property from TGeo units to Geant4 units
+ double conv = g4ConstPropertyConversion(idx);
printout(lvl, "Geant4Converter", "++ CONST Property: %-20s %g ", n->GetName(), v);
- tab->AddConstProperty(n->GetName(), v);
+ tab->AddConstProperty(n->GetName(), v * conv);
}
#endif
auto* ionization = mat->GetIonisation();
diff --git a/examples/OpticalSurfaces/compact/OpNovice.xml b/examples/OpticalSurfaces/compact/OpNovice.xml
index e28f981925f7eaf9e48ed0549ca1a9d2f2cab049..8a4e5bb95979dd297bd1c85078a16d4a6ce2ceba 100644
--- a/examples/OpticalSurfaces/compact/OpNovice.xml
+++ b/examples/OpticalSurfaces/compact/OpNovice.xml
@@ -16,10 +16,6 @@
<constant name="world_x" value="world_side/2"/>
<constant name="world_y" value="world_side/2"/>
<constant name="world_z" value="world_side/2"/>
- <constant name="g4::m" value="1000"/>
- <constant name="g4::ns" value="1.0"/>
- <constant name="g4::eV" value="1e-6"/>
- <constant name="g4::MeV" value="1.0"/>
</define>
<debug>
<type name="surface" value="1"/>
@@ -27,271 +23,271 @@
<properties>
<matrix name="RINDEX__Air" coldim="2" values="
- 2.034*g4::eV 1.
- 2.068*g4::eV 1.
- 2.103*g4::eV 1.
- 2.139*g4::eV 1.
- 2.177*g4::eV 1.
- 2.216*g4::eV 1.
- 2.256*g4::eV 1.
- 2.298*g4::eV 1.
- 2.341*g4::eV 1.
- 2.386*g4::eV 1.
- 2.433*g4::eV 1.
- 2.481*g4::eV 1.
- 2.532*g4::eV 1.
- 2.585*g4::eV 1.
- 2.640*g4::eV 1.
- 2.697*g4::eV 1.
- 2.757*g4::eV 1.
- 2.820*g4::eV 1.
- 2.885*g4::eV 1.
- 2.954*g4::eV 1.
- 3.026*g4::eV 1.
- 3.102*g4::eV 1.
- 3.181*g4::eV 1.
- 3.265*g4::eV 1.
- 3.353*g4::eV 1.
- 3.446*g4::eV 1.
- 3.545*g4::eV 1.
- 3.649*g4::eV 1.
- 3.760*g4::eV 1.
- 3.877*g4::eV 1.
- 4.002*g4::eV 1.
- 4.136*g4::eV 1.
+ 2.034*eV 1.
+ 2.068*eV 1.
+ 2.103*eV 1.
+ 2.139*eV 1.
+ 2.177*eV 1.
+ 2.216*eV 1.
+ 2.256*eV 1.
+ 2.298*eV 1.
+ 2.341*eV 1.
+ 2.386*eV 1.
+ 2.433*eV 1.
+ 2.481*eV 1.
+ 2.532*eV 1.
+ 2.585*eV 1.
+ 2.640*eV 1.
+ 2.697*eV 1.
+ 2.757*eV 1.
+ 2.820*eV 1.
+ 2.885*eV 1.
+ 2.954*eV 1.
+ 3.026*eV 1.
+ 3.102*eV 1.
+ 3.181*eV 1.
+ 3.265*eV 1.
+ 3.353*eV 1.
+ 3.446*eV 1.
+ 3.545*eV 1.
+ 3.649*eV 1.
+ 3.760*eV 1.
+ 3.877*eV 1.
+ 4.002*eV 1.
+ 4.136*eV 1.
"/>
<matrix name="RINDEX__Water" coldim="2" values="
- 2.034*g4::eV 1.3435
- 2.068*g4::eV 1.344
- 2.103*g4::eV 1.3445
- 2.139*g4::eV 1.345
- 2.177*g4::eV 1.3455
- 2.216*g4::eV 1.346
- 2.256*g4::eV 1.3465
- 2.298*g4::eV 1.347
- 2.341*g4::eV 1.3475
- 2.386*g4::eV 1.348
- 2.433*g4::eV 1.3485
- 2.481*g4::eV 1.3492
- 2.532*g4::eV 1.35
- 2.585*g4::eV 1.3505
- 2.640*g4::eV 1.351
- 2.697*g4::eV 1.3518
- 2.757*g4::eV 1.3522
- 2.820*g4::eV 1.3530
- 2.885*g4::eV 1.3535
- 2.954*g4::eV 1.354
- 3.026*g4::eV 1.3545
- 3.102*g4::eV 1.355
- 3.181*g4::eV 1.3555
- 3.265*g4::eV 1.356
- 3.353*g4::eV 1.3568
- 3.446*g4::eV 1.3572
- 3.545*g4::eV 1.358
- 3.649*g4::eV 1.3585
- 3.760*g4::eV 1.359
- 3.877*g4::eV 1.3595
- 4.002*g4::eV 1.36
- 4.136*g4::eV 1.3608
+ 2.034*eV 1.3435
+ 2.068*eV 1.344
+ 2.103*eV 1.3445
+ 2.139*eV 1.345
+ 2.177*eV 1.3455
+ 2.216*eV 1.346
+ 2.256*eV 1.3465
+ 2.298*eV 1.347
+ 2.341*eV 1.3475
+ 2.386*eV 1.348
+ 2.433*eV 1.3485
+ 2.481*eV 1.3492
+ 2.532*eV 1.35
+ 2.585*eV 1.3505
+ 2.640*eV 1.351
+ 2.697*eV 1.3518
+ 2.757*eV 1.3522
+ 2.820*eV 1.3530
+ 2.885*eV 1.3535
+ 2.954*eV 1.354
+ 3.026*eV 1.3545
+ 3.102*eV 1.355
+ 3.181*eV 1.3555
+ 3.265*eV 1.356
+ 3.353*eV 1.3568
+ 3.446*eV 1.3572
+ 3.545*eV 1.358
+ 3.649*eV 1.3585
+ 3.760*eV 1.359
+ 3.877*eV 1.3595
+ 4.002*eV 1.36
+ 4.136*eV 1.3608
"/>
<matrix name="ABSLENGTH__Water" coldim="2" values="
- 2.034*g4::eV 3.448*m
- 2.068*g4::eV 4.082*m
- 2.103*g4::eV 6.329*m
- 2.139*g4::eV 9.174*m
- 2.177*g4::eV 12.346*m
- 2.216*g4::eV 13.889*m
- 2.256*g4::eV 15.152*m
- 2.298*g4::eV 17.241*m
- 2.341*g4::eV 18.868*m
- 2.386*g4::eV 20.000*m
- 2.433*g4::eV 26.316*m
- 2.481*g4::eV 35.714*m
- 2.532*g4::eV 45.455*m
- 2.585*g4::eV 47.619*m
- 2.640*g4::eV 52.632*m
- 2.697*g4::eV 52.632*m
- 2.757*g4::eV 55.556*m
- 2.820*g4::eV 52.632*m
- 2.885*g4::eV 52.632*m
- 2.954*g4::eV 47.619*m
- 3.026*g4::eV 45.455*m
- 3.102*g4::eV 41.667*m
- 3.181*g4::eV 37.037*m
- 3.265*g4::eV 33.333*m
- 3.353*g4::eV 30.000*m
- 3.446*g4::eV 28.500*m
- 3.545*g4::eV 27.000*m
- 3.649*g4::eV 24.500*m
- 3.760*g4::eV 22.000*m
- 3.877*g4::eV 19.500*m
- 4.002*g4::eV 17.500*m
- 4.136*g4::eV 14.500*m
+ 2.034*eV 3.448*m
+ 2.068*eV 4.082*m
+ 2.103*eV 6.329*m
+ 2.139*eV 9.174*m
+ 2.177*eV 12.346*m
+ 2.216*eV 13.889*m
+ 2.256*eV 15.152*m
+ 2.298*eV 17.241*m
+ 2.341*eV 18.868*m
+ 2.386*eV 20.000*m
+ 2.433*eV 26.316*m
+ 2.481*eV 35.714*m
+ 2.532*eV 45.455*m
+ 2.585*eV 47.619*m
+ 2.640*eV 52.632*m
+ 2.697*eV 52.632*m
+ 2.757*eV 55.556*m
+ 2.820*eV 52.632*m
+ 2.885*eV 52.632*m
+ 2.954*eV 47.619*m
+ 3.026*eV 45.455*m
+ 3.102*eV 41.667*m
+ 3.181*eV 37.037*m
+ 3.265*eV 33.333*m
+ 3.353*eV 30.000*m
+ 3.446*eV 28.500*m
+ 3.545*eV 27.000*m
+ 3.649*eV 24.500*m
+ 3.760*eV 22.000*m
+ 3.877*eV 19.500*m
+ 4.002*eV 17.500*m
+ 4.136*eV 14.500*m
"/>
<matrix name= "FASTCOMPONENT__Water" coldim="2" values="
- 2.034*g4::eV 1
- 2.068*g4::eV 1
- 2.103*g4::eV 1
- 2.139*g4::eV 1
- 2.177*g4::eV 1
- 2.216*g4::eV 1
- 2.256*g4::eV 1
- 2.298*g4::eV 1
- 2.341*g4::eV 1
- 2.386*g4::eV 1
- 2.433*g4::eV 1
- 2.481*g4::eV 1
- 2.532*g4::eV 1
- 2.585*g4::eV 1
- 2.640*g4::eV 1
- 2.697*g4::eV 1
- 2.757*g4::eV 1
- 2.820*g4::eV 1
- 2.885*g4::eV 1
- 2.954*g4::eV 1
- 3.026*g4::eV 1
- 3.102*g4::eV 1
- 3.181*g4::eV 1
- 3.265*g4::eV 1
- 3.353*g4::eV 1
- 3.446*g4::eV 1
- 3.545*g4::eV 1
- 3.649*g4::eV 1
- 3.760*g4::eV 1
- 3.877*g4::eV 1
- 4.002*g4::eV 1
- 4.136*g4::eV 1
+ 2.034*eV 1
+ 2.068*eV 1
+ 2.103*eV 1
+ 2.139*eV 1
+ 2.177*eV 1
+ 2.216*eV 1
+ 2.256*eV 1
+ 2.298*eV 1
+ 2.341*eV 1
+ 2.386*eV 1
+ 2.433*eV 1
+ 2.481*eV 1
+ 2.532*eV 1
+ 2.585*eV 1
+ 2.640*eV 1
+ 2.697*eV 1
+ 2.757*eV 1
+ 2.820*eV 1
+ 2.885*eV 1
+ 2.954*eV 1
+ 3.026*eV 1
+ 3.102*eV 1
+ 3.181*eV 1
+ 3.265*eV 1
+ 3.353*eV 1
+ 3.446*eV 1
+ 3.545*eV 1
+ 3.649*eV 1
+ 3.760*eV 1
+ 3.877*eV 1
+ 4.002*eV 1
+ 4.136*eV 1
"/>
<matrix name= "SLOWCOMPONENT__Water" coldim="2" values="
- 2.034*g4::eV 0.01
- 2.068*g4::eV 1
- 2.103*g4::eV 2
- 2.139*g4::eV 3
- 2.177*g4::eV 4
- 2.216*g4::eV 5
- 2.256*g4::eV 6
- 2.298*g4::eV 7
- 2.341*g4::eV 8
- 2.386*g4::eV 9
- 2.433*g4::eV 8
- 2.481*g4::eV 7
- 2.532*g4::eV 6
- 2.585*g4::eV 4
- 2.640*g4::eV 3
- 2.697*g4::eV 2
- 2.757*g4::eV 1
- 2.820*g4::eV 0.01
- 2.885*g4::eV 1
- 2.954*g4::eV 2
- 3.026*g4::eV 3
- 3.102*g4::eV 4
- 3.181*g4::eV 5
- 3.265*g4::eV 6
- 3.353*g4::eV 7
- 3.446*g4::eV 8
- 3.545*g4::eV 9
- 3.649*g4::eV 8
- 3.760*g4::eV 7
- 3.877*g4::eV 6
- 4.002*g4::eV 5
- 4.136*g4::eV 4
+ 2.034*eV 0.01
+ 2.068*eV 1
+ 2.103*eV 2
+ 2.139*eV 3
+ 2.177*eV 4
+ 2.216*eV 5
+ 2.256*eV 6
+ 2.298*eV 7
+ 2.341*eV 8
+ 2.386*eV 9
+ 2.433*eV 8
+ 2.481*eV 7
+ 2.532*eV 6
+ 2.585*eV 4
+ 2.640*eV 3
+ 2.697*eV 2
+ 2.757*eV 1
+ 2.820*eV 0.01
+ 2.885*eV 1
+ 2.954*eV 2
+ 3.026*eV 3
+ 3.102*eV 4
+ 3.181*eV 5
+ 3.265*eV 6
+ 3.353*eV 7
+ 3.446*eV 8
+ 3.545*eV 9
+ 3.649*eV 8
+ 3.760*eV 7
+ 3.877*eV 6
+ 4.002*eV 5
+ 4.136*eV 4
"/>
<matrix name= "MIEHG__Water" coldim="2" values="
- 1.56962*g4::eV 167024.4*g4::m
- 1.58974*g4::eV 158726.7*g4::m
- 1.61039*g4::eV 150742.0*g4::m
- 1.63157*g4::eV 143062.5*g4::m
- 1.65333*g4::eV 135680.2*g4::m
- 1.67567*g4::eV 128587.4*g4::m
- 1.69863*g4::eV 121776.3*g4::m
- 1.72222*g4::eV 115239.5*g4::m
- 1.74647*g4::eV 108969.5*g4::m
- 1.77142*g4::eV 102958.8*g4::m
- 1.79710*g4::eV 97200.35*g4::m
- 1.82352*g4::eV 91686.86*g4::m
- 1.85074*g4::eV 86411.33*g4::m
- 1.87878*g4::eV 81366.79*g4::m
- 1.90769*g4::eV 76546.42*g4::m
- 1.93749*g4::eV 71943.46*g4::m
- 1.96825*g4::eV 67551.29*g4::m
- 1.99999*g4::eV 63363.36*g4::m
- 2.03278*g4::eV 59373.25*g4::m
- 2.06666*g4::eV 55574.61*g4::m
- 2.10169*g4::eV 51961.24*g4::m
- 2.13793*g4::eV 48527.00*g4::m
- 2.17543*g4::eV 45265.87*g4::m
- 2.21428*g4::eV 42171.94*g4::m
- 2.25454*g4::eV 39239.39*g4::m
- 2.29629*g4::eV 36462.50*g4::m
- 2.33962*g4::eV 33835.68*g4::m
- 2.38461*g4::eV 31353.41*g4::m
- 2.43137*g4::eV 29010.30*g4::m
- 2.47999*g4::eV 26801.03*g4::m
- 2.53061*g4::eV 24720.42*g4::m
- 2.58333*g4::eV 22763.36*g4::m
- 2.63829*g4::eV 20924.88*g4::m
- 2.69565*g4::eV 19200.07*g4::m
- 2.75555*g4::eV 17584.16*g4::m
- 2.81817*g4::eV 16072.45*g4::m
- 2.88371*g4::eV 14660.38*g4::m
- 2.95237*g4::eV 13343.46*g4::m
- 3.02438*g4::eV 12117.33*g4::m
- 3.09999*g4::eV 10977.70*g4::m
- 3.17948*g4::eV 9920.416*g4::m
- 3.26315*g4::eV 8941.407*g4::m
- 3.35134*g4::eV 8036.711*g4::m
- 3.44444*g4::eV 7202.470*g4::m
- 3.54285*g4::eV 6434.927*g4::m
- 3.64705*g4::eV 5730.429*g4::m
- 3.75757*g4::eV 5085.425*g4::m
- 3.87499*g4::eV 4496.467*g4::m
- 3.99999*g4::eV 3960.210*g4::m
- 4.13332*g4::eV 3473.413*g4::m
- 4.27585*g4::eV 3032.937*g4::m
- 4.42856*g4::eV 2635.746*g4::m
- 4.59258*g4::eV 2278.907*g4::m
- 4.76922*g4::eV 1959.588*g4::m
- 4.95999*g4::eV 1675.064*g4::m
- 5.16665*g4::eV 1422.710*g4::m
- 5.39129*g4::eV 1200.004*g4::m
- 5.63635*g4::eV 1004.528*g4::m
- 5.90475*g4::eV 833.9666*g4::m
- 6.19998*g4::eV 686.1063*g4::m
+ 1.56962*eV 167024.4*m
+ 1.58974*eV 158726.7*m
+ 1.61039*eV 150742.0*m
+ 1.63157*eV 143062.5*m
+ 1.65333*eV 135680.2*m
+ 1.67567*eV 128587.4*m
+ 1.69863*eV 121776.3*m
+ 1.72222*eV 115239.5*m
+ 1.74647*eV 108969.5*m
+ 1.77142*eV 102958.8*m
+ 1.79710*eV 97200.35*m
+ 1.82352*eV 91686.86*m
+ 1.85074*eV 86411.33*m
+ 1.87878*eV 81366.79*m
+ 1.90769*eV 76546.42*m
+ 1.93749*eV 71943.46*m
+ 1.96825*eV 67551.29*m
+ 1.99999*eV 63363.36*m
+ 2.03278*eV 59373.25*m
+ 2.06666*eV 55574.61*m
+ 2.10169*eV 51961.24*m
+ 2.13793*eV 48527.00*m
+ 2.17543*eV 45265.87*m
+ 2.21428*eV 42171.94*m
+ 2.25454*eV 39239.39*m
+ 2.29629*eV 36462.50*m
+ 2.33962*eV 33835.68*m
+ 2.38461*eV 31353.41*m
+ 2.43137*eV 29010.30*m
+ 2.47999*eV 26801.03*m
+ 2.53061*eV 24720.42*m
+ 2.58333*eV 22763.36*m
+ 2.63829*eV 20924.88*m
+ 2.69565*eV 19200.07*m
+ 2.75555*eV 17584.16*m
+ 2.81817*eV 16072.45*m
+ 2.88371*eV 14660.38*m
+ 2.95237*eV 13343.46*m
+ 3.02438*eV 12117.33*m
+ 3.09999*eV 10977.70*m
+ 3.17948*eV 9920.416*m
+ 3.26315*eV 8941.407*m
+ 3.35134*eV 8036.711*m
+ 3.44444*eV 7202.470*m
+ 3.54285*eV 6434.927*m
+ 3.64705*eV 5730.429*m
+ 3.75757*eV 5085.425*m
+ 3.87499*eV 4496.467*m
+ 3.99999*eV 3960.210*m
+ 4.13332*eV 3473.413*m
+ 4.27585*eV 3032.937*m
+ 4.42856*eV 2635.746*m
+ 4.59258*eV 2278.907*m
+ 4.76922*eV 1959.588*m
+ 4.95999*eV 1675.064*m
+ 5.16665*eV 1422.710*m
+ 5.39129*eV 1200.004*m
+ 5.63635*eV 1004.528*m
+ 5.90475*eV 833.9666*m
+ 6.19998*eV 686.1063*m
"/>
<ignore>
<matrix name= "REFLECTIVITY__Water" coldim="2" values="
- 2.034*g4::eV
- 2.068*g4::eV
- 2.103*g4::eV
- 2.139*g4::eV
- 2.177*g4::eV
- 2.216*g4::eV
- 2.256*g4::eV
- 2.298*g4::eV
- 2.341*g4::eV
- 2.386*g4::eV
- 2.433*g4::eV
- 2.481*g4::eV
- 2.532*g4::eV
- 2.585*g4::eV
- 2.640*g4::eV
- 2.697*g4::eV
- 2.757*g4::eV
- 2.820*g4::eV
- 2.885*g4::eV
- 2.954*g4::eV
- 3.026*g4::eV
- 3.102*g4::eV
- 3.181*g4::eV
- 3.265*g4::eV
- 3.353*g4::eV
- 3.446*g4::eV
- 3.545*g4::eV
- 3.649*g4::eV
- 3.760*g4::eV
- 3.877*g4::eV
- 4.002*g4::eV
- 4.136*g4::eV
+ 2.034*eV
+ 2.068*eV
+ 2.103*eV
+ 2.139*eV
+ 2.177*eV
+ 2.216*eV
+ 2.256*eV
+ 2.298*eV
+ 2.341*eV
+ 2.386*eV
+ 2.433*eV
+ 2.481*eV
+ 2.532*eV
+ 2.585*eV
+ 2.640*eV
+ 2.697*eV
+ 2.757*eV
+ 2.820*eV
+ 2.885*eV
+ 2.954*eV
+ 3.026*eV
+ 3.102*eV
+ 3.181*eV
+ 3.265*eV
+ 3.353*eV
+ 3.446*eV
+ 3.545*eV
+ 3.649*eV
+ 3.760*eV
+ 3.877*eV
+ 4.002*eV
+ 4.136*eV
"/>
</ignore>
</properties>
@@ -328,15 +324,15 @@
<D type="density" value="1.0" unit="g/cm3"/>
<composite n="2" ref="H"/>
<composite n="1" ref="O"/>
- <property name="RINDEX" ref="RINDEX__Water"/>
- <property name="ABSLENGTH" ref="ABSLENGTH__Water"/>
- <property name="FASTCOMPONENT" ref="FASTCOMPONENT__Water"/>
- <property name="SLOWCOMPONENT" ref="SLOWCOMPONENT__Water"/>
- <property name="MIEHG" ref="MIEHG__Water"/>
- <constant name="SCINTILLATIONYIELD" value="50.0/g4::MeV"/>
+ <property name="RINDEX" ref="RINDEX__Water"/>
+ <property name="ABSLENGTH" ref="ABSLENGTH__Water"/>
+ <property name="FASTCOMPONENT" ref="FASTCOMPONENT__Water"/>
+ <property name="SLOWCOMPONENT" ref="SLOWCOMPONENT__Water"/>
+ <property name="MIEHG" ref="MIEHG__Water"/>
+ <constant name="SCINTILLATIONYIELD" value="50.0/MeV"/>
<constant name="RESOLUTIONSCALE" value="1.0"/>
- <constant name="FASTTIMECONSTANT" value="1.0*g4::ns"/>
- <constant name="SLOWTIMECONSTANT" value="10.0*g4::ns"/>
+ <constant name="FASTTIMECONSTANT" value="1.0*ns"/>
+ <constant name="SLOWTIMECONSTANT" value="10.0*ns"/>
<constant name="YIELDRATIO" value="0.8"/>
<constant name="MIEHG_FORWARD" value="0.99"/>
<constant name="MIEHG_BACKWARD" value="0.99"/>
@@ -351,15 +347,15 @@
<surfaces>
<alt___opticalsurface name="/world/BubbleDevice#WaterSurface" finish="ground" model="unified" type="dielectric_dielectric">
- <property name="RINDEX" coldim="2" values="2.034*g4::eV 1.35 4.136*g4::eV 1.40"/>
- <property name="SPECULARLOBECONSTANT" coldim="2" values="2.034*g4::eV 0.3 4.136*g4::eV 0.3 "/>
- <property name="SPECULARSPIKECONSTANT" coldim="2" values="2.034*g4::eV 0.2 4.136*g4::eV 0.2 "/>
- <property name="BACKSCATTERCONSTANT" coldim="2" values="2.034*g4::eV 0.2 4.136*g4::eV 0.2 "/>
+ <property name="RINDEX" coldim="2" values="2.034*eV 1.35 4.136*eV 1.40"/>
+ <property name="SPECULARLOBECONSTANT" coldim="2" values="2.034*eV 0.3 4.136*eV 0.3 "/>
+ <property name="SPECULARSPIKECONSTANT" coldim="2" values="2.034*eV 0.2 4.136*eV 0.2 "/>
+ <property name="BACKSCATTERCONSTANT" coldim="2" values="2.034*eV 0.2 4.136*eV 0.2 "/>
</alt___opticalsurface>
<opticalsurface name="/world/BubbleDevice#WaterSurface" finish="Rough_LUT" model="DAVIS" type="dielectric_LUTDAVIS"/>
<opticalsurface name="/world/BubbleDevice#AirSurface" finish="polished" model="glisur" type="dielectric_dielectric">
- <property name="REFLECTIVITY" coldim="2" values="2.034*g4::eV 0.3 4.136*g4::eV 0.5"/>
- <property name="EFFICIENCY" coldim="2" values="2.034*g4::eV 0.8 4.136*g4::eV 1.0"/>
+ <property name="REFLECTIVITY" coldim="2" values="2.034*eV 0.3 4.136*eV 0.5"/>
+ <property name="EFFICIENCY" coldim="2" values="2.034*eV 0.8 4.136*eV 1.0"/>
</opticalsurface>
</surfaces>