Skip to content

Commit

Permalink
Merge pull request #49 from MarcFBergevin/master
Browse files Browse the repository at this point in the history 
New default WATCHMAN detector
  • Loading branch information
@ekneale
ekneale authored Sep 4, 2019
2 parents a318e0c + 2b1a283 commit f4bea6d
Show file tree
Hide file tree
Showing 9 changed files with 709 additions and 32 deletions.
15 changes: 15 additions & 0 deletions data/MATERIALS.ratdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,21 @@ elements: ["Carbon", "Fluorine",],
elemprop: [0.24018, 0.75982],
}


{
name: "MATERIAL",
index: "lightcone", // Teflon from NIST database
valid_begin : [0, 0],
valid_end : [0, 0],
density: 2.20,
nelements: 2,
nmaterials: 0,
elements: ["Carbon", "Fluorine",],
elemprop: [0.24018, 0.75982],
}



{
name: "MATERIAL",
index: "ptfe_fabric", // Gore DRP Diffuse Reflector (ePTFE)
Expand Down
28 changes: 28 additions & 0 deletions data/OPTICS.ratdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,29 @@ ABSLENGTH_value2: [1.0e-3, 1.0e-3, ],
PROPERTY_LIST: ["REFLECTIVITY", "ABSLENGTH", ]
}


{
name: "OPTICS",
index: "lightcone",
valid_begin : [0, 0],
valid_end : [0, 0],
surface: 1,
finish: "ground",
model: "glisur",
type: "dielectric_metal",
polish: 0.01,
REFLECTIVITY_option: "wavelength",
REFLECTIVITY_value1: [60.0, 100.0, 250.0, 400.0, 15000.0, 2200.0, ],
REFLECTIVITY_value2: [0.0, 0.0, 0.99, 0.99, 0.99, 0.99, ],
ABSLENGTH_option: "wavelength",
ABSLENGTH_value1: [60.0, 800.0, ],
ABSLENGTH_value2: [1.0e-3, 1.0e-3, ],
PROPERTY_LIST: ["REFLECTIVITY", "ABSLENGTH", ]
}




{
name: "OPTICS",
index: "ptfe_fabric", // Gore DRP Diffuse Reflector (ePTFE)
Expand Down Expand Up @@ -258,6 +281,11 @@ valid_begin : [0, 0],
valid_end : [0, 0],
REFLECTIVITY_option: "wavelength",
// Digitised from http://dx.doi.org/10.1109/TNS.2012.2183385
surface: 1,
finish: "ground",
model: "glisur",
type: "dielectric_dielectric",
polish: 0.9,
REFLECTIVITY_value1: [ 302.626, 306.828, 315.231, 319.958, 324.16, 330.987, 336.24, 340.441, 344.118, 347.269, 350.945, 353.571, 356.197, 358.298, 359.874, 361.45, 362.5, 363.55, 365.126, 366.176, 367.227, 367.752, 368.277, 369.328, 369.853, 370.378, 371.429, 371.954, 373.004, 374.055, 375.105, 376.155, 376.681, 377.731, 378.782, 379.307, 380.357, 380.882, 381.408, 382.458, 383.508, 384.034, 385.609, 386.66, 388.235, 389.811, 391.912, 393.487, 395.063, 396.113, 397.689, 399.265, 400.315, 401.891, 403.466, 405.567, 407.143, 408.718, 409.767, 410.628, 411.706, 412.567, 413.645, 414.506, 415.368, 417.092, 419.031, 420.108, 421.616, 422.908, 424.201, 425.925, 427.433, 428.294, 429.372, 430.664, 432.172, 433.68, 434.973, 436.481, 438.42, 440.144, 442.513, 443.806, 444.883, 446.176, 447.684, 448.761, 450.7, 451.993, 453.07, 454.578, 456.086, 457.379, 459.102, 460.61, 462.334, 463.627, 464.704, 466.212, 467.289, 468.797, 470.305, 472.029, 473.537, 475.26, 476.768, 479.569, 481.077, 483.447, 484.955, 486.032, 488.187, 489.479, 491.418, 492.926, 494.004, 496.429, 499.055, 503.782, 509.034, 514.286, 521.113, 527.941, 533.193, 539.496, 545.273, 551.576, 557.353, 566.281, 571.008, 575.735, 582.563, 587.29, 590.966, 598.319, 602.521, 606.197, 616.702, 621.954, 628.781, 635.084, 640.861, 647.164, 652.416, 657.143, 662.395, 667.647, 672.899, 677.101, 682.353, 689.181, 694.433, 700.735, 705.462, 712.29, 717.017, 721.219, 728.571, 732.773, 738.025, 743.803, 749.58, 754.307, 760.609, 765.336, 770.063, 775.315, 780.042, 784.769, 789.496, 793.697, 798.424, ],
REFLECTIVITY_value2: [ 0.0602583, 0.0602583, 0.061693, 0.0602583, 0.061693, 0.061693, 0.0631277, 0.0674319, 0.0731707, 0.0789096, 0.0918221, 0.1033, 0.120517, 0.136298, 0.147776, 0.163558, 0.180775, 0.196557, 0.219512, 0.239598, 0.256815, 0.271162, 0.284075, 0.298422, 0.315638, 0.327116, 0.338594, 0.350072, 0.368723, 0.403156, 0.421808, 0.43759, 0.456241, 0.476327, 0.493544, 0.506456, 0.523673, 0.539455, 0.550933, 0.568149, 0.579627, 0.593974, 0.615495, 0.634146, 0.661406, 0.680057, 0.707317, 0.728838, 0.751793, 0.770445, 0.791966, 0.806313, 0.817791, 0.837877, 0.855093, 0.86944, 0.882353, 0.890961, 0.901538, 0.904615, 0.908462, 0.911154, 0.914231, 0.916538, 0.918462, 0.921154, 0.923462, 0.924231, 0.926154, 0.927308, 0.928077, 0.928846, 0.93, 0.930385, 0.931923, 0.932308, 0.932692, 0.933462, 0.934231, 0.935, 0.935385, 0.935385, 0.936154, 0.936154, 0.936923, 0.938077, 0.937692, 0.937692, 0.938077, 0.938846, 0.939231, 0.939615, 0.94, 0.940769, 0.940769, 0.940769, 0.941538, 0.942308, 0.943077, 0.943077, 0.942692, 0.943077, 0.943846, 0.943846, 0.943462, 0.944231, 0.944231, 0.944615, 0.945, 0.945385, 0.945, 0.945, 0.944615, 0.944231, 0.945, 0.945, 0.945, 0.939742, 0.939742, 0.942611, 0.942611, 0.942611, 0.942611, 0.942611, 0.944046, 0.944046, 0.944046, 0.944046, 0.944046, 0.944046, 0.944046, 0.944046, 0.942611, 0.942611, 0.942611, 0.942611, 0.942611, 0.942611, 0.942611, 0.942611, 0.941176, 0.941176, 0.941176, 0.939742, 0.939742, 0.939742, 0.938307, 0.938307, 0.938307, 0.938307, 0.938307, 0.936872, 0.938307, 0.936872, 0.936872, 0.935438, 0.935438, 0.935438, 0.934003, 0.934003, 0.934003, 0.932568, 0.932568, 0.932568, 0.932568, 0.932568, 0.932568, 0.931133, 0.931133, 0.931133, 0.929699, 0.928264, 0.929699, ],
PROPERTY_LIST: ["REFLECTIVITY",]
Expand Down
28 changes: 17 additions & 11 deletions data/Watchman/PMTINFO.ratdb
View file

Large diffs are not rendered by default.

132 changes: 130 additions & 2 deletions data/Watchman/SURFACES_Watchman.ratdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,98 @@ SPECULARSPIKECONSTANT_value1: [190.0,730.0],
SPECULARSPIKECONSTANT_value2: [0.0,0.0],
BACKSCATTERCONSTANT_option: "wavelength",
BACKSCATTERCONSTANT_value1: [190.0,730.0],
BACKSCATTERCONSTANT_value2: [1.0,1.0],
EFFICIENCY_option: "wavelength",
EFFICIENCY_value1: [190.0,730.0],
EFFICIENCY_value2: [1.0,1.0],
PROPERTY_LIST: ["REFLECTIVITY","SPECULARLOBECONSTANT","SPECULARSPIKECONSTANT","BACKSCATTERCONSTANT","EFFICIENCY"]
}



{ //dummmy material for db loading
name: "MATERIAL",
index: "nonreflective_tarp",
valid_begin : [0, 0],
valid_end : [0, 0],
density: 1.0,
nelements: 0,
nmaterials: 1,
materials: ["polypropylene"],
matprop: [1.0]
}

{
name: "OPTICS",
index: "nonreflective_tarp",
valid_begin : [0, 0],
valid_end : [0, 0],
surface: 1,
finish: "ground",
model: "glisur",
type: "dielectric_metal",
REFLECTIVITY_option: "wavelength",
REFLECTIVITY_value1: [190.0,730.0],
REFLECTIVITY_value2: [0.0,0.0],
SPECULARLOBECONSTANT_option: "wavelength",
SPECULARLOBECONSTANT_value1: [190.0,730.0],
SPECULARLOBECONSTANT_value2: [0.0,0.0],
SPECULARSPIKECONSTANT_option: "wavelength",
SPECULARSPIKECONSTANT_value1: [190.0,730.0],
SPECULARSPIKECONSTANT_value2: [0.0,0.0],
BACKSCATTERCONSTANT_option: "wavelength",
BACKSCATTERCONSTANT_value1: [190.0,730.0],
BACKSCATTERCONSTANT_value2: [0.0,0.0],
EFFICIENCY_option: "wavelength",
EFFICIENCY_value1: [190.0,730.0],
EFFICIENCY_value2: [0.0,0.0],
PROPERTY_LIST: ["REFLECTIVITY","SPECULARLOBECONSTANT","SPECULARSPIKECONSTANT","BACKSCATTERCONSTANT","EFFICIENCY"]
}



{ //dummmy material for db loading
name: "MATERIAL",
index: "reflective_tarp",
valid_begin : [0, 0],
valid_end : [0, 0],
density: 1.0,
nelements: 0,
nmaterials: 1,
materials: ["polypropylene"],
matprop: [1.0]
}

{
name: "OPTICS",
index: "reflective_tarp",
valid_begin : [0, 0],
valid_end : [0, 0],
surface: 1,
finish: "ground",
model: "glisur",
type: "dielectric_metal",
REFLECTIVITY_option: "wavelength",
REFLECTIVITY_value1: [190.0,730.0],
REFLECTIVITY_value2: [1.0,1.0],
SPECULARLOBECONSTANT_option: "wavelength",
SPECULARLOBECONSTANT_value1: [190.0,730.0],
SPECULARLOBECONSTANT_value2: [1.0,1.0],
SPECULARSPIKECONSTANT_option: "wavelength",
SPECULARSPIKECONSTANT_value1: [190.0,730.0],
SPECULARSPIKECONSTANT_value2: [0.0,0.0],
BACKSCATTERCONSTANT_option: "wavelength",
BACKSCATTERCONSTANT_value1: [190.0,730.0],
BACKSCATTERCONSTANT_value2: [0.0,0.0],
EFFICIENCY_option: "wavelength",
EFFICIENCY_value1: [190.0,730.0],
EFFICIENCY_value2: [1.0,1.0],
PROPERTY_LIST: ["REFLECTIVITY","SPECULARLOBECONSTANT","SPECULARSPIKECONSTANT","BACKSCATTERCONSTANT","EFFICIENCY"]
}




{ //dummmy material for db loading
name: "MATERIAL",
index: "white_water",
Expand Down Expand Up @@ -69,9 +154,52 @@ SPECULARSPIKECONSTANT_value1: [190.0,730.0],
SPECULARSPIKECONSTANT_value2: [0.0,0.0],
BACKSCATTERCONSTANT_option: "wavelength",
BACKSCATTERCONSTANT_value1: [190.0,730.0],
BACKSCATTERCONSTANT_value2: [0.0,0.0],
BACKSCATTERCONSTANT_value2: [1.0,1.0],
EFFICIENCY_option: "wavelength",
EFFICIENCY_value1: [190.0,730.0],
EFFICIENCY_value2: [0.0,0.0],
EFFICIENCY_value2: [1.0,1.0],
PROPERTY_LIST: ["REFLECTIVITY","SPECULARLOBECONSTANT","SPECULARSPIKECONSTANT","BACKSCATTERCONSTANT","EFFICIENCY"]
}


{ //dummmy material for db loading
name: "MATERIAL",
index: "retro_reflector",
valid_begin : [0, 0],
valid_end : [0, 0],
density: 1.0,
nelements: 0,
nmaterials: 1,
materials: ["polypropylene"],
matprop: [1.0]
}

{
name: "OPTICS",
index: "retro_reflector",
valid_begin : [0, 0],
valid_end : [0, 0],
surface: 1,
finish: "ground",
model: "glisur",
type: "dielectric_metal",
REFLECTIVITY_option: "wavelength",
REFLECTIVITY_value1: [190.0,730.0],
REFLECTIVITY_value2: [0.95,0.95],
SPECULARLOBECONSTANT_option: "wavelength",
SPECULARLOBECONSTANT_value1: [190.0,730.0],
SPECULARLOBECONSTANT_value2: [0.0,0.0],
SPECULARSPIKECONSTANT_option: "wavelength",
SPECULARSPIKECONSTANT_value1: [190.0,730.0],
SPECULARSPIKECONSTANT_value2: [0.0,0.0],
BACKSCATTERCONSTANT_option: "wavelength",
BACKSCATTERCONSTANT_value1: [190.0,730.0],
BACKSCATTERCONSTANT_value2: [1.0,1.0],
EFFICIENCY_option: "wavelength",
EFFICIENCY_value1: [190.0,730.0],
EFFICIENCY_value2: [1.0,1.0],
PROPERTY_LIST: ["REFLECTIVITY","SPECULARLOBECONSTANT","SPECULARSPIKECONSTANT","BACKSCATTERCONSTANT","EFFICIENCY"]
}



Loading

0 comments on commit f4bea6d

Please sign in to comment.