diff --git a/data/DAQ.ratdb b/data/DAQ.ratdb index 141d73b0..9f37c631 100644 --- a/data/DAQ.ratdb +++ b/data/DAQ.ratdb @@ -19,5 +19,6 @@ trigger_resolution: 1.0, lookback: 400.0, max_hit_time: 1000000.0, pmt_type: 1, -trigger_on_noise: 1 +trigger_on_noise: 1, +discriminator: 0.25 } diff --git a/data/MATERIALS.ratdb b/data/MATERIALS.ratdb index fa53a409..e34d848c 100644 --- a/data/MATERIALS.ratdb +++ b/data/MATERIALS.ratdb @@ -432,7 +432,17 @@ elements: ["Potassium"], elemprop: [1.0], } - +{ +name: "MATERIAL", +index: "photocathode_R14374", +valid_begin : [0, 0], +valid_end : [0, 0], +density: 5.0, +nelements: 1, +nmaterials: 0, +elements: ["Potassium"], +elemprop: [1.0], +} //// The photocathode material for the ET 9390B { @@ -671,6 +681,18 @@ elements: ["Hydrogen", "Carbon", "Oxygen"], elemprop: [0.0703, 0.558, 0.3717], } +{ +name: "MATERIAL", +index: "nakano_acrylic", +valid_begin : [0, 0], +valid_end : [0, 0], +density: 1.14, +nelements: 3, +nmaterials: 0, +elements: ["Hydrogen", "Carbon", "Oxygen"], +elemprop: [0.0703, 0.558, 0.3717], +} + { name: "MATERIAL", index: "acrylic_polycast", @@ -863,18 +885,6 @@ elements: ["Hydrogen", "Carbon", "Chlorine"], elemprop: [0.0484, 0.3844, 0.5672], } -{ -name: "MATERIAL", -index: "eljen_WLSP", -valid_begin : [0, 0], -valid_end : [0, 0], -density: 1.0, -nelements: 2, -nmaterials: 0, -elements: ["Carbon","Hydrogen"], -elemprop: [0.4737, 0.5263,], -formula: "AROMATIC", -} // ------------------ Gunite --------------------- //Place holder for when we get more info diff --git a/data/OPTICS.ratdb b/data/OPTICS.ratdb index 4b6d484a..d99f28d3 100644 --- a/data/OPTICS.ratdb +++ b/data/OPTICS.ratdb @@ -466,6 +466,30 @@ PROPERTY_LIST: ["EFFICIENCY", "RINDEX", "KINDEX", "THICKNESS", ] } +{ +name: "OPTICS", +index: "photocathode_R14374", +valid_begin : [0, 0], +valid_end : [0, 0], +photocathode: 1, + +EFFICIENCY_option: "wavelength", +EFFICIENCY_value1: [275.0, 270.0, 280.0, 290.0, 300.0, 310.0, 320.0, 330.0, 340.0, 350.0, 360.0, 370.0, 380.0, 390.0, 400.0, 410.0, 420.0, 430.0, 440.0, 450.0, 460.0, 470.0, 480.0, 490.0, 500.0, 510.0, 520.0, 530.0, 540.0, 550.0, 560.0, 570.0, 580.0, 590.0, 600.0, 610.0, 620.0, 630.0, 640.0, 650.0, 660.0, 670.0, 680.0, 690.0, 700.0, 710.0, 720.0, 730.0, 740.0, 750.0,], +EFFICIENCY_value2: [0.00594, 0.00502, 0.00757, 0.01022, 0.07563, 0.13508, 0.19637, 0.23239, 0.25999, 0.2699, 0.275, 0.275, 0.275, 0.275, 0.275, 0.275, 0.2699, 0.2649, 0.25044, 0.2458, 0.23239, 0.2197, 0.20771, 0.19273, 0.18566, 0.15689, 0.13763, 0.10792, 0.09292, 0.08, 0.07151, 0.06157, 0.05401, 0.04564, 0.03383, 0.02703, 0.0193, 0.01279, 0.00847, 0.00531, 0.00286, 0.00154, 0.00076, 0.00038, 0.00017, 9e-05, 9e-05, 9e-05, 9e-05,0.,], + +//RINDEX, KINDEX and THICKNESS are copied from: photocathode_R7081HQE +RINDEX_option: "wavelength", +RINDEX_value1: [60.0, 200.0, 380.0, 395.0, 410.0, 425.0, 440.0, 455.0, 470.0, 485.0, 500.0, 515.0, 530.0, 545.0, 560.0, 575.0, 590.0, 605.0, 620.0, 635.0, 650.0, 665.0, 680.0, 800.0, ], +RINDEX_value2: [1.0, 1.0, 1.92, 2.18, 2.38, 2.61, 2.70, 2.87, 3.00, 3.00, 3.00, 3.09, 3.26, 3.20, 3.12, 3.06, 3.01, 2.98, 2.96, 2.95, 2.95, 2.95, 2.96, 3.0, ], + +KINDEX_option: "wavelength", +KINDEX_value1: [60.0, 200.0, 380.0, 395.0, 410.0, 425.0, 440.0, 455.0, 470.0, 485.0, 500.0, 515.0, 530.0, 545.0, 560.0, 575.0, 590.0, 605.0, 620.0, 635.0, 650.0, 665.0, 680.0, 800.0, ], +KINDEX_value2: [3.0, 3.0, 1.69, 1.69, 1.71, 1.53, 1.50, 1.44, 1.34, 1.11, 1.06, 1.05, 0.86, 0.63, 0.53, 0.46, 0.42, 0.38, 0.37, 0.35, 0.34, 0.34, 0.33, 0.1, ], + +THICKNESS_value1: [188.0, 0.0, ], +THICKNESS_value2: [26e-6, 26e-6, ], +PROPERTY_LIST: ["EFFICIENCY", "RINDEX", "KINDEX", "THICKNESS", ] +} { name: "OPTICS", @@ -781,7 +805,20 @@ ABSLENGTH_value2: [1.0e-3, 1.0e-3, 0.49e1, 2.75e1, 10.35e1, 14.99e1, 20.41e1, 28 PROPERTY_LIST: ["RINDEX", "ABSLENGTH", ] } - +{ +name : "OPTICS", +index : "nakano_acrylic", +valid_begin: [0, 0], +valid_end: [0, 0], +//this is taken from the: "acrylic_uvt_good"// +RINDEX_option: "wavelength", +RINDEX_value1: [60.0, 200.0, 210.0, 220.0, 230.0, 240.0, 250.0, 260.0, 270.0, 280.0, 290.0, 300.0, 310.0, 320.0, 330.0, 340.0, 350.0, 360.0, 370.0, 380.0, 390.0, 400.0, 410.0, 420.0, 430.0, 440.0, 450.0, 460.0, 470.0, 480.0, 490.0, 500.0, 510.0, 520.0, 530.0, 540.0, 550.0, 560.0, 570.0, 580.0, 590.0, 600.0, 610.0, 620.0, 630.0, 640.0, 650.0, 660.0, 670.0, 680.0, 690.0, 700.0, 710.0, 720.0, 730.0, 740.0, 750.0, 760.0, 770.0, 780.0, 790.0, 800.0, ], +RINDEX_value2: [1.597, 1.597, 1.584, 1.573, 1.564, 1.556, 1.550, 1.544, 1.539, 1.534, 1.531, 1.527, 1.524, 1.521, 1.519, 1.516, 1.514, 1.512, 1.510, 1.509, 1.507, 1.506, 1.505, 1.503, 1.502, 1.501, 1.500, 1.499, 1.499, 1.498, 1.497, 1.496, 1.496, 1.495, 1.494, 1.494, 1.493, 1.493, 1.492, 1.492, 1.491, 1.491, 1.490, 1.490, 1.490, 1.489, 1.489, 1.488, 1.488, 1.488, 1.488, 1.487, 1.487, 1.487, 1.486, 1.486, 1.486, 1.486, 1.485, 1.485, 1.485, 1.485, ], +ABSLENGTH_option : "wavelength", +ABSLENGTH_value1 : [200.0, 201.0, 202.0, 203.0, 204.0, 205.0, 206.0, 207.0, 208.0, 210.0, 211.0, 212.0, 215.0, 217.0, 218.0, 219.0, 220.0, 221.0, 223.0, 224.0, 226.0, 227.0, 228.0, 229.0, 232.0, 233.0, 235.0, 236.0, 237.0, 238.0, 239.0, 241.0, 242.0, 243.0, 244.0, 245.0, 247.0, 248.0, 249.0, 250.0, 251.0, 252.0, 253.0, 254.0, 255.0, 256.0, 257.0, 258.0, 259.0, 260.0, 261.0, 262.0, 263.0, 264.0, 265.0, 266.0, 267.0, 268.0, 269.0, 270.0, 271.0, 272.0, 273.0, 274.0, 275.0, 276.0, 277.0, 278.0, 279.0, 280.0, 281.0, 282.0, 283.0, 284.0, 285.0, 286.0, 287.0, 288.0, 289.0, 290.0, 291.0, 292.0, 293.0, 294.0, 295.0, 296.0, 297.0, 298.0, 299.0, 300.0, 301.0, 302.0, 303.0, 304.0, 305.0, 306.0, 307.0, 308.0, 309.0, 310.0, 311.0, 312.0, 313.0, 314.0, 315.0, 316.0, 317.0, 318.0, 319.0, 320.0, 321.0, 322.0, 323.0, 324.0, 325.0, 326.0, 327.0, 328.0, 329.0, 330.0, 331.0, 332.0, 333.0, 334.0, 335.0, 336.0, 337.0, 338.0, 339.0, 340.0, 341.0, 342.0, 343.0, 344.0, 345.0, 346.0, 347.0, 348.0, 349.0, 350.0, 351.0, 352.0, 353.0, 354.0, 355.0, 356.0, 357.0, 358.0, 359.0, 360.0, 361.0, 362.0, 363.0, 364.0, 365.0, 366.0, 367.0, 368.0, 369.0, 370.0, 371.0, 372.0, 373.0, 374.0, 375.0, 376.0, 377.0, 378.0, 379.0, 380.0, 381.0, 382.0, 383.0, 384.0, 385.0, 386.0, 387.0, 388.0, 389.0, 390.0, 391.0, 392.0, 393.0, 394.0, 395.0, 396.0, 397.0, 398.0, 399.0, 400.0, 401.0, 402.0, 403.0, 404.0, 405.0, 406.0, 407.0, 408.0, 409.0, 410.0, 411.0, 412.0, 413.0, 414.0, 415.0, 416.0, 417.0, 418.0, 419.0, 420.0, 421.0, 422.0, 423.0, 424.0, 425.0, 426.0, 427.0, 428.0, 429.0, 430.0, 431.0, 432.0, 433.0, 434.0, 435.0, 436.0, 437.0, 438.0, 439.0, 440.0, 441.0, 442.0, 443.0, 444.0, 445.0, 446.0, 447.0, 448.0, 449.0, 450.0, 451.0, 452.0, 453.0, 454.0, 455.0, 456.0, 457.0, 458.0, 459.0, 460.0, 461.0, 462.0, 463.0, 464.0, 465.0, 466.0, 467.0, 468.0, 469.0, 470.0, 471.0, 472.0, 473.0, 474.0, 475.0, 476.0, 477.0, 478.0, 479.0, 480.0, 481.0, 482.0, 483.0, 484.0, 485.0, 486.0, 487.0, 488.0, 489.0, 490.0, 491.0, 492.0, 493.0, 494.0, 495.0, 496.0, 497.0, 498.0, 499.0, 500.0, 501.0, 502.0, 503.0, 504.0, 505.0, 506.0, 507.0, 508.0, 509.0, 510.0, 511.0, 512.0, 513.0, 514.0, 515.0, 516.0, 517.0, 518.0, 519.0, 520.0, 521.0, 522.0, 523.0, 524.0, 525.0, 526.0, 527.0, 528.0, 529.0, 530.0, 531.0, 532.0, 533.0, 534.0, 535.0, 536.0, 537.0, 538.0, 539.0, 540.0, 541.0, 542.0, 543.0, 544.0, 545.0, 546.0, 547.0, 548.0, 549.0, 550.0, 551.0, 552.0, 553.0, 554.0, 555.0, 556.0, 557.0, 558.0, 559.0, 560.0, 561.0, 562.0, 563.0, 564.0, 565.0, 566.0, 567.0, 568.0, 569.0, 570.0, 571.0, 572.0, 573.0, 574.0, 575.0, 576.0, 577.0, 578.0, 579.0, 580.0, 581.0, 582.0, 583.0, 584.0, 585.0, 586.0, 587.0, 588.0, 589.0, 590.0, 591.0, 592.0, 593.0, 594.0, 595.0, 596.0, 597.0, 598.0, 599.0, 600.0, 601.0, 602.0, 603.0, 604.0, 605.0, 606.0, 607.0, 608.0, 609.0, 610.0, 611.0, 612.0, 613.0, 614.0, 615.0, 616.0, 617.0, 618.0, 619.0, 620.0, 621.0, 622.0, 623.0, 624.0, 625.0, 626.0, 627.0, 628.0, 629.0, 630.0, 631.0, 632.0, 633.0, 634.0, 635.0, 636.0, 637.0, 638.0, 639.0, 640.0, 641.0, 642.0, 643.0, 644.0, 645.0, 646.0, 647.0, 648.0, 649.0, 650.0], +ABSLENGTH_value2 : [6.766646, 6.766646, 6.106986, 6.106986, 5.086679, 5.234611, 5.902842, 4.893309, 5.234611, 5.234611, 5.234611, 5.234611, 4.893309, 5.84476, 5.466055, 5.086679, 5.234611, 4.893309, 5.086679, 5.234611, 5.355951, 5.466055, 5.637248, 5.637248, 4.573503, 4.573503, 4.893309, 4.573503, 5.234611, 5.355951, 5.086679, 5.234611, 5.234611, 5.086679, 5.086679, 5.086679, 4.893309, 5.234611, 5.466055, 5.355951, 4.893309, 5.466055, 5.355951, 5.234611, 5.466055, 5.466055, 5.466055, 5.355951, 5.556357, 5.466055, 5.234611, 5.466055, 5.782536, 5.84476, 5.466055, 5.556357, 5.637248, 5.902842, 5.782536, 5.466055, 5.556357, 5.957376, 5.84476, 5.466055, 5.902842, 5.902842, 5.84476, 5.710734, 5.957376, 5.782536, 5.902842, 6.151102, 6.351271, 6.275325, 6.236473, 6.151102, 6.106986, 6.196074, 6.351271, 6.151102, 6.351271, 6.766646, 7.208724, 8.193268, 9.868894, 11.880833, 14.244282, 16.784146, 19.717709, 23.049586, 26.544354, 30.195035, 34.219501, 38.321886, 42.39765, 46.533259, 50.832953, 54.948511, 58.922905, 63.085969, 67.41336, 71.748641, 76.120996, 80.767293, 85.202911, 89.821651, 94.348418, 98.754483, 103.012398, 107.681056, 112.008174, 115.824833, 119.440937, 123.252061, 127.16593, 132.325345, 138.370286, 144.227796, 150.049118, 156.658243, 163.287528, 170.370174, 176.796012, 182.930312, 188.820709, 194.353756, 199.864259, 205.589488, 209.876284, 216.19017, 222.810381, 227.815651, 232.801149, 238.132189, 243.486785, 249.15384, 255.109166, 260.232763, 264.958051, 271.619689, 277.810437, 283.393802, 289.664446, 295.411718, 300.792124, 307.391599, 314.538422, 320.976971, 326.690368, 332.629732, 339.013314, 345.045319, 351.023973, 357.949102, 364.397882, 370.92331, 376.497665, 384.094671, 389.787601, 397.409983, 403.865868, 410.067323, 416.681403, 422.050509, 429.345314, 434.771993, 440.719417, 445.811451, 451.43275, 457.327331, 460.508839, 464.304619, 470.003848, 473.055345, 476.825729, 480.345269, 482.357526, 485.480714, 489.044336, 490.963178, 493.948192, 496.811707, 498.870234, 500.366134, 502.035214, 502.370299, 502.452762, 502.959098, 503.041744, 504.472855, 505.661163, 506.597773, 506.765371, 508.390937, 508.908706, 509.421833, 511.501276, 513.327622, 513.499477, 515.258672, 516.489989, 517.290734, 517.465122, 519.425929, 521.035411, 521.849624, 523.568564, 524.110178, 525.112888, 526.942644, 527.406503, 528.784576, 529.622008, 531.200547, 532.321296, 534.483581, 534.675357, 535.716939, 535.716939, 537.711638, 539.242129, 539.726836, 540.395456, 540.977048, 541.654968, 541.458395, 541.750133, 542.722638, 544.082073, 545.358034, 546.433226, 547.124249, 547.616082, 549.103165, 549.402809, 549.702766, 550.401701, 551.397501, 552.600961, 553.710197, 553.306948, 553.306948, 554.319438, 554.624538, 555.841487, 556.348386, 556.856167, 556.856167, 558.492409, 559.421894, 558.391556, 560.557435, 560.34757, 561.072579, 562.214531, 562.418919, 562.214531, 563.983763, 564.614778, 565.033912, 565.556944, 567.034673, 567.665291, 569.258173, 568.192988, 567.561251, 567.984574, 569.153575, 568.937521, 569.258173, 568.833034, 568.624172, 568.408502, 568.088763, 566.6127, 565.977416, 565.770552, 564.086554, 563.046592, 561.901413, 561.384816, 560.34757, 560.246076, 560.036433, 558.391556, 558.70095, 558.189954, 558.492409, 559.523103, 561.276174, 562.105583, 562.944163, 565.033912, 565.660284, 566.398485, 566.923934, 567.665291, 568.833034, 570.110275, 570.754456, 570.754456, 573.005963, 573.111919, 572.469695, 573.005963, 574.734174, 576.036885, 577.345253, 576.586709, 576.586709, 576.908499, 578.443502, 577.567452, 577.897468, 579.213936, 579.762353, 579.762353, 580.869419, 581.75508, 581.52979, 582.533976, 582.417379, 582.643326, 583.307562, 583.534171, 582.978913, 583.088423, 582.862145, 584.090441, 584.427625, 584.985526, 583.87074, 583.87074, 584.317633, 583.87074, 582.978913, 584.090441, 584.427625, 584.655067, 583.088423, 583.197973, 586.333085, 586.561948, 585.772723, 585.772723, 586.333085, 587.464299, 586.451186, 586.67275, 586.561948, 587.805219, 587.694008, 588.934436, 589.053543, 588.822816, 589.508059, 588.822816, 589.508059, 589.963247, 591.332857, 591.678088, 590.531309, 590.075282, 590.075282, 591.100419, 591.332857, 590.306949, 590.763319, 590.187357, 589.843789, 590.075282, 590.763319, 589.843789, 590.306949, 589.843789, 589.619928, 587.464299, 586.901867, 586.111767, 584.537656, 583.534171, 581.52979, 579.654034, 577.567452, 575.495184, 572.794163, 570.432192, 567.880422, 566.191327, 564.504939, 564.717789, 564.923918, 563.668761, 563.983763, 564.402003, 566.820153, 567.984574, 569.579171, 571.182345, 572.900044, 573.005963, 573.543192, 573.868825, 574.407602, 574.954456, 575.388384, 575.167785, 576.036885, 576.258122, 576.801198, 577.459916, 578.774476, 577.345253, 578.774476, 577.459916, 577.897468, 576.908499, 576.365231, 577.130377, 578.227844, 578.11289, 577.789814, 575.495184, 576.151052, 577.567452, 577.130377, 575.495184, 573.22498, 572.251229, 570.642325, 572.039962, 570.327181, 569.362809, 567.242421, 566.191327, 565.977416, 565.033912, 563.778289, 560.970834, 559.421894], +PROPERTY_LIST: ["RINDEX","ABSLENGTH"] +} { name: "OPTICS", @@ -942,51 +979,3 @@ ABSLENGTH_value1: [60.0, 200.0, 400.0, 600.0, 800.0, ], ABSLENGTH_value2: [1e-3, 1e-3, 1.6e-1, 2.1e-1, 2.5e-1, ], PROPERTY_LIST: ["REFLECTIVITY", "ABSLENGTH", ] } - -//Based on values provided by Eljen -{ -name: "OPTICS", -index: "eljen_WLSP", -valid_begin : [0, 0], -valid_end : [0, 0], -surface: 1, -finish: "polished", -model: "unified", -polish: 0.9, -LIGHT_YIELD: 0.0, //Does not scintillate! -RINDEX_option: "wavelength", -RINDEX_value1: [430.0, 455.0, 480.0, 510.0, 545.0, 589.26, ], -RINDEX_value2: [1.605, 1.6, 1.595, 1.59, 1.585, 1.58, ], -SCINTILLATION_option: "dy_dwavelength", -SCINTILLATION_value1: [360.0,365.0,370.0,375.0,380.0,385.0,390.0,395.0,400.0,405.0,410.0,415.0,420.0,425.0,430.0,435.0,440.0, -445.0,450.0,455.0,460.0,465.0,470.0,475.0,480.0,485.0,490.0,495.0,500.0,505.0,510.0,515.0,520.0, -525.0,530.0 ], -SCINTILLATION_value2: [0.0089,0.04,0.1082,0.38,0.6702,0.8,0.74,0.7118,0.8559,0.99,0.98,0.8,0.6667,0.645,0.623,0.57,0.4956, -0.4,0.3289,0.28,0.2388,0.21,0.1848,0.15,0.1125,0.09,0.0721,0.06,0.0496,0.038,0.027,0.021,0.0181, -0.01,0.0089 ], -SCINTILLATION_WLS_option: "dy_dwavelength", -SCINTILLATION_WLS_value1: [360.0,365.0,370.0,375.0,380.0,385.0,390.0,395.0,400.0,405.0,410.0,415.0,420.0,425.0,430.0,435.0,440.0, -445.0,450.0,455.0,460.0,465.0,470.0,475.0,480.0,485.0,490.0,495.0,500.0,505.0,510.0,515.0,520.0, -525.0,530.0 ], -SCINTILLATION_WLS_value2: [0.0089,0.04,0.1082,0.38,0.6702,0.8,0.74,0.7118,0.8559,0.99,0.98,0.8,0.6667,0.645,0.623,0.57,0.4956, -0.4,0.3289,0.28,0.2388,0.21,0.1848,0.15,0.1125,0.09,0.0721,0.06,0.0496,0.038,0.027,0.021,0.0181, -0.01,0.0089 ], //Repeated from the SCINTILLATION field -ABSLENGTH_option: "wavelength", -ABSLENGTH_value1: [280.0,285.0,290.0,295.0,300.0,305.0,310.0,315.0,320.0,325.0,330.0, -335.0,340.0,345.0,350.0,355.0,360.0,365.0,370.0,375.0,380.0,385.0,390.0,395.0,400.0,405.0,410.0, -415.0,420.0,425.0,430.0,435.0,440.0 ], -ABSLENGTH_value2: [3.28817572011048,2.75133439718263,2.13990712803064,1.63409373161645,1.22558031227786,0.949388119357074,0.74896268667895, -0.612790156138932,0.499310950887775,0.426624800552906,0.3643611110099,0.320985038887337,0.285622070588639,0.256788195960208,0.242907702360334, -0.240738779165503,0.247364333031549,0.264081484983006,0.299585972186438,0.35950273581582,0.449379631418826,0.601847672354127,0.842587755514737, -1.3481449525453,2.6962899050906,7.09521782318717,53.9257981018119,963.391136801541,2450.98039215686,4484.30493273543,9615.38461538462,33333.3333333333, -142857.142857143], -SCINTWAVEFORM_value1: [-1.1], -SCINTWAVEFORM_value2: [1.0], -SCINT_RISE_TIME: 0.1, -REEMISSION_PROB_option: "wavelength", -REEMISSION_PROB_value1: [280.0,530.0 ], -REEMISSION_PROB_value2: [0.92,0.92], //Constant quantum efficiency used -SCINTMOD_value1: [1.0, ], -SCINTMOD_value2: [0.0, ], //Not necessarily needed because it does not scintillate -PROPERTY_LIST: ["LIGHT_YIELD", "RINDEX", "SCINTILLATION", "SCINTILLATION_WLS", "ABSLENGTH", "SCINT_RISE_TIME", "SCINTWAVEFORM", "REEMISSION_PROB","SCINTMOD"] -} diff --git a/data/PMT.ratdb b/data/PMT.ratdb index 687c441f..c8ddddb1 100644 --- a/data/PMT.ratdb +++ b/data/PMT.ratdb @@ -265,6 +265,31 @@ z_origin: [ -40.0d, 0.0d, 0.0d, 40.0d, -142.0d ], } +{ +name: "PMT", +index: "r14374", +valid_begin: [0,0], +valid_end: [0,0], + +dynode_material: "stainless_steel", +glass_material: "glass", +pmt_vacuum_material: "pmt_vacuum", +photocathode_surface: "photocathode_R14374", +photocathode_MINrho: 36.0d, +photocathode_MAXrho: 40.d, +mirror_surface: "mirror", +dynode_surface: "stainless_steel", +dynode_radius: 28.25, // mm +dynode_top: -5.9, // mm //???? +wall_thickness: 1.0, // mm +z_edge: [ 24.d, 10.0d, 0.0d, -10.0d, -21.0d, -58.0d ], +rho_edge: [ 0.0d, 36.0d, 40.d, 36.0d, 26.d, 26.d ], +z_origin: [ -10.0d, 0.0d, 0.0d, 10.0d, -58.0d ], + +} + + + { name: "PMT", index: "r3600", diff --git a/data/PMTCHARGE.ratdb b/data/PMTCHARGE.ratdb index 35d082a1..5e3573b0 100644 --- a/data/PMTCHARGE.ratdb +++ b/data/PMTCHARGE.ratdb @@ -101,6 +101,14 @@ charge : [0.0000, 0.1000, 0.2000, 0.3000, 0.4000, 0.5000, 0.6000, 0.7000, 0.8000 charge_prob : [2.320677e-02, 4.744035e-02, 8.994838e-02, 1.581799e-01, 2.580009e-01, 3.903046e-01, 5.476440e-01, 7.126976e-01, 8.602498e-01, 9.630662e-01, 1.000000e+00, 9.630662e-01, 8.602498e-01, 7.126976e-01, 5.476440e-01, 3.903046e-01, 2.580009e-01, 1.581799e-01, 8.994838e-02, 4.744035e-02, 2.320677e-02, 1.052916e-02, 4.430830e-03, 1.729373e-03, 6.260438e-04, 2.102001e-04, 6.545962e-05, 1.890716e-05, 5.065140e-06, 1.258545e-06, 2.900404e-07, 6.199556e-08, 1.229065e-08, 2.259964e-09, 3.854254e-10] } +{ // This is a copy of: r7081pe. It needs to be changed for the 3inch PMT +name: "PMTCHARGE", +index: "r14374", +valid_begin: [0,0], +valid_end: [0,0], +charge : [0.0000, 0.1000, 0.2000, 0.3000, 0.4000, 0.5000, 0.6000, 0.7000, 0.8000, 0.9000, 1.0000, 1.1000, 1.2000, 1.3000, 1.4000, 1.5000, 1.6000, 1.7000, 1.8000, 1.9000, 2.0000, 2.1000, 2.2000, 2.3000, 2.4000, 2.5000, 2.6000, 2.7000, 2.8000, 2.9000, 3.0000, 3.1000, 3.2000, 3.3000, 3.4000] +charge_prob : [2.320677e-02, 4.744035e-02, 8.994838e-02, 1.581799e-01, 2.580009e-01, 3.903046e-01, 5.476440e-01, 7.126976e-01, 8.602498e-01, 9.630662e-01, 1.000000e+00, 9.630662e-01, 8.602498e-01, 7.126976e-01, 5.476440e-01, 3.903046e-01, 2.580009e-01, 1.581799e-01, 8.994838e-02, 4.744035e-02, 2.320677e-02, 1.052916e-02, 4.430830e-03, 1.729373e-03, 6.260438e-04, 2.102001e-04, 6.545962e-05, 1.890716e-05, 5.065140e-06, 1.258545e-06, 2.900404e-07, 6.199556e-08, 1.229065e-08, 2.259964e-09, 3.854254e-10] +} { name: "PMTCHARGE", diff --git a/data/PMTTRANSIT.ratdb b/data/PMTTRANSIT.ratdb index c55c5865..990eee0a 100644 --- a/data/PMTTRANSIT.ratdb +++ b/data/PMTTRANSIT.ratdb @@ -21,6 +21,20 @@ cable_delay: 0.0, time: [-20. -19.21568627 -18.43137255 -17.64705882 -16.8627451, -16.07843137, -15.29411765, -14.50980392, -13.7254902, -12.94117647, -12.15686275, -11.37254902, -10.58823529, -9.80392157, -9.01960784, -8.23529412, -7.45098039, -6.66666667, -5.88235294, -5.09803922, -4.31372549, -3.52941176, -2.74509804, -1.96078431, -1.17647059, -0.39215686, 0.39215686, 1.17647059, 1.96078431, 2.74509804, 3.52941176, 4.31372549, 5.09803922, 5.88235294, 6.66666667,7.45098039, 8.23529412, 9.01960784, 9.80392157, 10.58823529, 11.37254902, 12.15686275, 12.94117647, 13.7254902, 14.50980392, 15.29411765, 16.07843137, 16.8627451, 17.64705882, 18.43137255,19.21568627, 20.], time_prob:[1.40806896e-23, 7.11618481e-22, 3.07415373e-20, 1.13516505e-18, 3.58300581e-17, 9.66698580e-16, 2.22940883e-14, 4.39484357e-13, 7.40546261e-12, 1.06663550e-10, 1.31321230e-09, 1.38200279e-08, 1.24319131e-07, 9.55921167e-07, 6.28291610e-06, 3.52984398e-05, 1.69513710e-04, 6.95839718e-04, 2.44156712e-03, 7.32290148e-03, 1.87738257e-02, 4.11412460e-02, 7.70649974e-02, 1.23393409e-01, 1.68881403e-01, 1.97572620e-01, 1.97572620e-01, 1.68881403e-01, 1.23393409e-01, 7.70649974e-02, 4.11412460e-02, 1.87738257e-02, 7.32290148e-03, 2.44156712e-03, 6.95839718e-04, 1.69513710e-04, 3.52984398e-05, 6.28291610e-06, 9.55921167e-07, 1.24319131e-07, 1.38200279e-08, 1.31321230e-09, 1.06663550e-10, 7.40546261e-12, 4.39484357e-13, 2.22940883e-14, 9.66698580e-16, 3.58300581e-17, 1.13516505e-18, 3.07415373e-20, 7.11618481e-22, 1.40806896e-23], } + +//Transit Time for 3inch PMT:R14374, Transit time of 1.3ns +//values from: https://www.hamamatsu.com/resources/pdf/etd/R14374_R14689_TPMH1381E.pdf +{ +name: "PMTTRANSIT", +index: "r14374", +valid_begin : [0,0], +valid_end : [0,0], +cable_delay: 0.0, +time: [-8.0, -7.9, -7.8, -7.7, -7.6, -7.5, -7.4, -7.3, -7.2, -7.1, -7.0, -6.9, -6.8, -6.7, -6.6, -6.5, -6.4, -6.3, -6.2, -6.1, -6.0, -5.9, -5.8, -5.7, -5.6, -5.5, -5.4, -5.3, -5.2, -5.1, -5.0, -4.9, -4.8, -4.7, -4.6, -4.5, -4.4, -4.3, -4.2, -4.1, -4.0, -3.9, -3.8, -3.7, -3.6, -3.5, -3.4, -3.3, -3.2, -3.1, -2.9, -2.9, -2.8, -2.7, -2.6, -2.5, -2.4, -2.3, -2.2, -2.1, -2.0, -1.9, -1.8, -1.7, -1.6, -1.5, -1.4, -1.3, -1.2, -1.1, -1.0, -0.9, -0.8, -0.7, -0.6, -0.5, -0.4, -0.3, -0.2, 0.0, 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.8, 1.9, 2.0, 2.1, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 4.0, 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9, 5.0, 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, 6.1, 6.2, 6.3, 6.4, 6.5, 6.6, 6.7, 6.8, 6.9, 7.0, 7.1, 7.3, 7.4, 7.5, 7.6, 7.7, 7.8, 7.9, 8.0], +time_prob:[0.0, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.004773, 0.004773, 0.004773, 0.004773, 0.004773, 0.004773, 0.004773, 0.004773, 0.004773, 0.004773, 0.004773, 0.00716, 0.00716, 0.00716, 0.009547, 0.016706, 0.023866, 0.0358, 0.042959, 0.073986, 0.093079, 0.116945, 0.150358, 0.195704, 0.286396, 0.346062, 0.422434, 0.546539, 0.706444, 0.801909, 0.897375, 0.997613, 1.0, 0.988067, 0.961814, 0.899761, 0.837709, 0.768496, 0.670644, 0.584726, 0.515513, 0.443914, 0.393795, 0.329356, 0.272076, 0.236277, 0.202864, 0.174224, 0.140811, 0.121718, 0.109785, 0.107399, 0.097852, 0.090692, 0.081146, 0.081146, 0.071599, 0.066826, 0.062053, 0.057279, 0.052506, 0.047733, 0.045346, 0.038186, 0.0358, 0.033413, 0.02864, 0.02864, 0.02864, 0.026253, 0.023866, 0.023866, 0.019093, 0.02148, 0.02148, 0.016706, 0.016706, 0.016706, 0.01432, 0.011933, 0.011933, 0.009547, 0.009547, 0.009547, 0.009547, 0.00716, 0.00716, 0.004773, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.002387, 0.0], +} + + // Placeholder for r11780_hqe data { name: "PMTTRANSIT", diff --git a/data/SuperK/OPTICS_SuperK.ratdb b/data/SuperK/OPTICS_SuperK.ratdb index aa49329f..d29a0f6c 100644 --- a/data/SuperK/OPTICS_SuperK.ratdb +++ b/data/SuperK/OPTICS_SuperK.ratdb @@ -9,9 +9,13 @@ valid_begin : [0, 0], valid_end : [0, 0], photocathode: 1, -EFFICIENCY_option: "wavelength", +/*EFFICIENCY_option: "wavelength", EFFICIENCY_value1: [ 227.0 , 228.0 , 229.0 , 230.0 , 231.0 , 232.0 , 233.0 , 234.0 , 235.0 , 236.0 , 237.0 , 238.0 , 239.0 , 240.0 , 241.0 , 242.0 , 243.0 , 244.0 , 245.0 , 246.0 , 247.0 , 248.0 , 249.0 , 250.0 , 251.0 , 252.0 , 253.0 , 254.0 , 255.0 , 256.0 , 257.0 , 258.0 , 259.0 , 260.0 , 261.0 , 262.0 , 263.0 , 264.0 , 265.0 , 266.0 , 267.0 , 268.0 , 269.0 , 270.0 , 271.0 , 272.0 , 273.0 , 274.0 , 275.0 , 276.0 , 277.0 , 278.0 , 279.0 , 280.0 , 281.0 , 282.0 , 283.0 , 284.0 , 285.0 , 286.0 , 287.0 , 288.0 , 289.0 , 290.0 , 291.0 , 292.0 , 293.0 , 294.0 , 295.0 , 296.0 , 297.0 , 298.0 , 299.0 , 300.0 , 301.0 , 302.0 , 303.0 , 304.0 , 305.0 , 306.0 , 307.0 , 308.0 , 309.0 , 310.0 , 311.0 , 312.0 , 313.0 , 314.0 , 315.0 , 316.0 , 317.0 , 318.0 , 319.0 , 320.0 , 321.0 , 322.0 , 323.0 , 324.0 , 325.0 , 326.0 , 327.0 , 328.0 , 329.0 , 330.0 , 331.0 , 332.0 , 333.0 , 334.0 , 335.0 , 336.0 , 337.0 , 338.0 , 339.0 , 340.0 , 341.0 , 342.0 , 343.0 , 344.0 , 345.0 , 346.0 , 347.0 , 348.0 , 349.0 , 350.0 , 351.0 , 352.0 , 353.0 , 354.0 , 355.0 , 356.0 , 357.0 , 358.0 , 359.0 , 360.0 , 361.0 , 362.0 , 363.0 , 364.0 , 365.0 , 366.0 , 367.0 , 368.0 , 369.0 , 370.0 , 371.0 , 372.0 , 373.0 , 374.0 , 375.0 , 376.0 , 377.0 , 378.0 , 379.0 , 380.0 , 381.0 , 382.0 , 383.0 , 384.0 , 385.0 , 386.0 , 387.0 , 388.0 , 389.0 , 390.0 , 391.0 , 392.0 , 393.0 , 394.0 , 395.0 , 396.0 , 397.0 , 398.0 , 399.0 , 400.0 , 401.0 , 402.0 , 403.0 , 404.0 , 405.0 , 406.0 , 407.0 , 408.0 , 409.0 , 410.0 , 411.0 , 412.0 , 413.0 , 414.0 , 415.0 , 416.0 , 417.0 , 418.0 , 419.0 , 420.0 , 421.0 , 422.0 , 423.0 , 424.0 , 425.0 , 426.0 , 427.0 , 428.0 , 429.0 , 430.0 , 431.0 , 432.0 , 433.0 , 434.0 , 435.0 , 436.0 , 437.0 , 438.0 , 439.0 , 440.0 , 441.0 , 442.0 , 443.0 , 444.0 , 445.0 , 446.0 , 447.0 , 448.0 , 449.0 , 450.0 , 451.0 , 452.0 , 453.0 , 454.0 , 455.0 , 456.0 , 457.0 , 458.0 , 459.0 , 460.0 , 461.0 , 462.0 , 463.0 , 464.0 , 465.0 , 466.0 , 467.0 , 468.0 , 469.0 , 470.0 , 471.0 , 472.0 , 473.0 , 474.0 , 475.0 , 476.0 , 477.0 , 478.0 , 479.0 , 480.0 , 481.0 , 482.0 , 483.0 , 484.0 , 485.0 , 486.0 , 487.0 , 488.0 , 489.0 , 490.0 , 491.0 , 492.0 , 493.0 , 494.0 , 495.0 , 496.0 , 497.0 , 498.0 , 499.0 , 500.0 , 501.0 , 502.0 , 503.0 , 504.0 , 505.0 , 506.0 , 507.0 , 508.0 , 509.0 , 510.0 , 511.0 , 512.0 , 513.0 , 514.0 , 515.0 , 516.0 , 517.0 , 518.0 , 519.0 , 520.0 , 521.0 , 522.0 , 523.0 , 524.0 , 525.0 , 526.0 , 527.0 , 528.0 , 529.0 , 530.0 , 531.0 , 532.0 , 533.0 , 534.0 , 535.0 , 536.0 , 537.0 , 538.0 , 539.0 , 540.0 , 541.0 , 542.0 , 543.0 , 544.0 , 545.0 , 546.0 , 547.0 , 548.0 , 549.0 , 550.0 , 551.0 , 552.0 , 553.0 , 554.0 , 555.0 , 556.0 , 557.0 , 558.0 , 559.0 , 560.0 , 561.0 , 562.0 , 563.0 , 564.0 , 565.0 , 566.0 , 567.0 , 568.0 , 569.0 , 570.0 , 571.0 , 572.0 , 573.0 , 574.0 , 575.0 , 576.0 , 577.0 , 578.0 , 579.0 , 580.0 , 581.0 , 582.0 , 583.0 , 584.0 , 585.0 , 586.0 , 587.0 , 588.0 , 589.0 , 590.0 , 591.0 , 592.0 , 593.0 , 594.0 , 595.0 , 596.0 , 597.0 , 598.0 , 599.0 , 600.0 , 601.0 , 602.0 , 603.0 , 604.0 , 605.0 , 606.0 , 607.0 , 608.0 , 609.0 , 610.0 , 611.0 , 612.0 , 613.0 , 614.0 , 615.0 , 616.0 , 617.0 , 618.0 , 619.0 , 620.0 , 621.0 , 622.0 , 623.0 , 624.0 , 625.0 , 626.0 , 627.0 , 628.0 , 629.0 , 630.0 , 631.0 , 632.0 , 633.0 , 634.0 , 635.0 , 636.0 , 637.0 , 638.0 , 639.0 , 640.0 , 641.0 , 642.0 , 643.0 , 644.0 , 645.0 , 646.0 , 647.0 , 648.0 , 649.0 , 650.0 , 651.0 , 652.0 , 653.0 , 654.0 , 655.0 , 656.0 , 657.0 , 658.0 , 659.0 , 660.0 , 661.0 , 662.0 , 663.0 , 664.0 , 665.0 , 666.0 , 667.0 , 668.0 , 669.0 , 670.0 , 671.0 , 672.0 , 673.0 , 674.0 , 675.0 , 676.0 , 677.0 , 678.0 , 679.0 , 680.0 , 681.0 , 682.0 , 683.0 , 684.0 , 685.0 , 686.0 , 687.0 , 688.0 , 689.0 , 690.0 , 691.0 , 692.0 , 693.0 , 694.0 , 695.0 , 696.0 , ], -EFFICIENCY_value2: [ 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 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.00251 , 0.00502 , 0.00753 , 0.01004 , 0.01255 , 0.01506 , 0.01757 , 0.02008 , 0.02259 , 0.0251 , 0.02761 , 0.03012 , 0.03263 , 0.03514 , 0.03765 , 0.04016 , 0.04267 , 0.04518 , 0.04769 , 0.0502 , 0.057775 , 0.06535 , 0.072925 , 0.0805 , 0.088075 , 0.09565 , 0.103225 , 0.1108 , 0.118375 , 0.12595 , 0.133525 , 0.1411 , 0.148675 , 0.15625 , 0.163825 , 0.1714 , 0.178975 , 0.18655 , 0.194125 , 0.2017 , 0.20628 , 0.21086 , 0.21544 , 0.22002 , 0.2246 , 0.22918 , 0.23376 , 0.23834 , 0.24292 , 0.2475 , 0.25208 , 0.25666 , 0.26124 , 0.26582 , 0.2704 , 0.27498 , 0.27956 , 0.28414 , 0.28872 , 0.2933 , 0.295165 , 0.29703 , 0.298895 , 0.30076 , 0.302625 , 0.30449 , 0.306355 , 0.30822 , 0.310085 , 0.31195 , 0.313815 , 0.31568 , 0.317545 , 0.31941 , 0.321275 , 0.32314 , 0.325005 , 0.32687 , 0.328735 , 0.3306 , 0.33105 , 0.3315 , 0.33195 , 0.3324 , 0.33285 , 0.3333 , 0.33375 , 0.3342 , 0.33465 , 0.3351 , 0.33555 , 0.336 , 0.33645 , 0.3369 , 0.33735 , 0.3378 , 0.33825 , 0.3387 , 0.33915 , 0.3396 , 0.33922 , 0.33884 , 0.33846 , 0.33808 , 0.3377 , 0.33732 , 0.33694 , 0.33656 , 0.33618 , 0.3358 , 0.33542 , 0.33504 , 0.33466 , 0.33428 , 0.3339 , 0.33352 , 0.33314 , 0.33276 , 0.33238 , 0.332 , 0.33124 , 0.33048 , 0.32972 , 0.32896 , 0.3282 , 0.32744 , 0.32668 , 0.32592 , 0.32516 , 0.3244 , 0.32364 , 0.32288 , 0.32212 , 0.32136 , 0.3206 , 0.31984 , 0.31908 , 0.31832 , 0.31756 , 0.3168 , 0.315535 , 0.31427 , 0.313005 , 0.31174 , 0.310475 , 0.30921 , 0.307945 , 0.30668 , 0.305415 , 0.30415 , 0.302885 , 0.30162 , 0.300355 , 0.29909 , 0.297825 , 0.29656 , 0.295295 , 0.29403 , 0.292765 , 0.2915 , 0.2902 , 0.2889 , 0.2876 , 0.2863 , 0.285 , 0.2837 , 0.2824 , 0.2811 , 0.2798 , 0.2785 , 0.2772 , 0.2759 , 0.2746 , 0.2733 , 0.272 , 0.2707 , 0.2694 , 0.2681 , 0.2668 , 0.2655 , 0.263565 , 0.26163 , 0.259695 , 0.25776 , 0.255825 , 0.25389 , 0.251955 , 0.25002 , 0.248085 , 0.24615 , 0.244215 , 0.24228 , 0.240345 , 0.23841 , 0.236475 , 0.23454 , 0.232605 , 0.23067 , 0.228735 , 0.2268 , 0.225315 , 0.22383 , 0.222345 , 0.22086 , 0.219375 , 0.21789 , 0.216405 , 0.21492 , 0.213435 , 0.21195 , 0.210465 , 0.20898 , 0.207495 , 0.20601 , 0.204525 , 0.20304 , 0.201555 , 0.20007 , 0.198585 , 0.1971 , 0.19545 , 0.1938 , 0.19215 , 0.1905 , 0.18885 , 0.1872 , 0.18555 , 0.1839 , 0.18225 , 0.1806 , 0.17895 , 0.1773 , 0.17565 , 0.174 , 0.17235 , 0.1707 , 0.16905 , 0.1674 , 0.16575 , 0.1641 , 0.161405 , 0.15871 , 0.156015 , 0.15332 , 0.150625 , 0.14793 , 0.145235 , 0.14254 , 0.139845 , 0.13715 , 0.134455 , 0.13176 , 0.129065 , 0.12637 , 0.123675 , 0.12098 , 0.118285 , 0.11559 , 0.112895 , 0.1102 , 0.108325 , 0.10645 , 0.104575 , 0.1027 , 0.100825 , 0.09895 , 0.097075 , 0.0952 , 0.093325 , 0.09145 , 0.089575 , 0.0877 , 0.085825 , 0.08395 , 0.082075 , 0.0802 , 0.078325 , 0.07645 , 0.074575 , 0.0727 , 0.07156 , 0.07042 , 0.06928 , 0.06814 , 0.067 , 0.06586 , 0.06472 , 0.06358 , 0.06244 , 0.0613 , 0.06016 , 0.05902 , 0.05788 , 0.05674 , 0.0556 , 0.05446 , 0.05332 , 0.05218 , 0.05104 , 0.0499 , 0.04902 , 0.04814 , 0.04726 , 0.04638 , 0.0455 , 0.04462 , 0.04374 , 0.04286 , 0.04198 , 0.0411 , 0.04022 , 0.03934 , 0.03846 , 0.03758 , 0.0367 , 0.03582 , 0.03494 , 0.03406 , 0.03318 , 0.0323 , 0.031575 , 0.03085 , 0.030125 , 0.0294 , 0.028675 , 0.02795 , 0.027225 , 0.0265 , 0.025775 , 0.02505 , 0.024325 , 0.0236 , 0.022875 , 0.02215 , 0.021425 , 0.0207 , 0.019975 , 0.01925 , 0.018525 , 0.0178 , 0.017215 , 0.01663 , 0.016045 , 0.01546 , 0.014875 , 0.01429 , 0.013705 , 0.01312 , 0.012535 , 0.01195 , 0.011365 , 0.01078 , 0.010195 , 0.00961 , 0.009025 , 0.00844 , 0.007855 , 0.00727 , 0.006685 , 0.0061 , 0.005795 , 0.00549 , 0.005185 , 0.00488 , 0.004575 , 0.00427 , 0.003965 , 0.00366 , 0.003355 , 0.00305 , 0.002745 , 0.00244 , 0.002135 , 0.00183 , 0.001525 , 0.00122 , 0.000915 , 0.00061 , 0.000305 , 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 , ], +EFFICIENCY_value2: [ 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 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.00251 , 0.00502 , 0.00753 , 0.01004 , 0.01255 , 0.01506 , 0.01757 , 0.02008 , 0.02259 , 0.0251 , 0.02761 , 0.03012 , 0.03263 , 0.03514 , 0.03765 , 0.04016 , 0.04267 , 0.04518 , 0.04769 , 0.0502 , 0.057775 , 0.06535 , 0.072925 , 0.0805 , 0.088075 , 0.09565 , 0.103225 , 0.1108 , 0.118375 , 0.12595 , 0.133525 , 0.1411 , 0.148675 , 0.15625 , 0.163825 , 0.1714 , 0.178975 , 0.18655 , 0.194125 , 0.2017 , 0.20628 , 0.21086 , 0.21544 , 0.22002 , 0.2246 , 0.22918 , 0.23376 , 0.23834 , 0.24292 , 0.2475 , 0.25208 , 0.25666 , 0.26124 , 0.26582 , 0.2704 , 0.27498 , 0.27956 , 0.28414 , 0.28872 , 0.2933 , 0.295165 , 0.29703 , 0.298895 , 0.30076 , 0.302625 , 0.30449 , 0.306355 , 0.30822 , 0.310085 , 0.31195 , 0.313815 , 0.31568 , 0.317545 , 0.31941 , 0.321275 , 0.32314 , 0.325005 , 0.32687 , 0.328735 , 0.3306 , 0.33105 , 0.3315 , 0.33195 , 0.3324 , 0.33285 , 0.3333 , 0.33375 , 0.3342 , 0.33465 , 0.3351 , 0.33555 , 0.336 , 0.33645 , 0.3369 , 0.33735 , 0.3378 , 0.33825 , 0.3387 , 0.33915 , 0.3396 , 0.33922 , 0.33884 , 0.33846 , 0.33808 , 0.3377 , 0.33732 , 0.33694 , 0.33656 , 0.33618 , 0.3358 , 0.33542 , 0.33504 , 0.33466 , 0.33428 , 0.3339 , 0.33352 , 0.33314 , 0.33276 , 0.33238 , 0.332 , 0.33124 , 0.33048 , 0.32972 , 0.32896 , 0.3282 , 0.32744 , 0.32668 , 0.32592 , 0.32516 , 0.3244 , 0.32364 , 0.32288 , 0.32212 , 0.32136 , 0.3206 , 0.31984 , 0.31908 , 0.31832 , 0.31756 , 0.3168 , 0.315535 , 0.31427 , 0.313005 , 0.31174 , 0.310475 , 0.30921 , 0.307945 , 0.30668 , 0.305415 , 0.30415 , 0.302885 , 0.30162 , 0.300355 , 0.29909 , 0.297825 , 0.29656 , 0.295295 , 0.29403 , 0.292765 , 0.2915 , 0.2902 , 0.2889 , 0.2876 , 0.2863 , 0.285 , 0.2837 , 0.2824 , 0.2811 , 0.2798 , 0.2785 , 0.2772 , 0.2759 , 0.2746 , 0.2733 , 0.272 , 0.2707 , 0.2694 , 0.2681 , 0.2668 , 0.2655 , 0.263565 , 0.26163 , 0.259695 , 0.25776 , 0.255825 , 0.25389 , 0.251955 , 0.25002 , 0.248085 , 0.24615 , 0.244215 , 0.24228 , 0.240345 , 0.23841 , 0.236475 , 0.23454 , 0.232605 , 0.23067 , 0.228735 , 0.2268 , 0.225315 , 0.22383 , 0.222345 , 0.22086 , 0.219375 , 0.21789 , 0.216405 , 0.21492 , 0.213435 , 0.21195 , 0.210465 , 0.20898 , 0.207495 , 0.20601 , 0.204525 , 0.20304 , 0.201555 , 0.20007 , 0.198585 , 0.1971 , 0.19545 , 0.1938 , 0.19215 , 0.1905 , 0.18885 , 0.1872 , 0.18555 , 0.1839 , 0.18225 , 0.1806 , 0.17895 , 0.1773 , 0.17565 , 0.174 , 0.17235 , 0.1707 , 0.16905 , 0.1674 , 0.16575 , 0.1641 , 0.161405 , 0.15871 , 0.156015 , 0.15332 , 0.150625 , 0.14793 , 0.145235 , 0.14254 , 0.139845 , 0.13715 , 0.134455 , 0.13176 , 0.129065 , 0.12637 , 0.123675 , 0.12098 , 0.118285 , 0.11559 , 0.112895 , 0.1102 , 0.108325 , 0.10645 , 0.104575 , 0.1027 , 0.100825 , 0.09895 , 0.097075 , 0.0952 , 0.093325 , 0.09145 , 0.089575 , 0.0877 , 0.085825 , 0.08395 , 0.082075 , 0.0802 , 0.078325 , 0.07645 , 0.074575 , 0.0727 , 0.07156 , 0.07042 , 0.06928 , 0.06814 , 0.067 , 0.06586 , 0.06472 , 0.06358 , 0.06244 , 0.0613 , 0.06016 , 0.05902 , 0.05788 , 0.05674 , 0.0556 , 0.05446 , 0.05332 , 0.05218 , 0.05104 , 0.0499 , 0.04902 , 0.04814 , 0.04726 , 0.04638 , 0.0455 , 0.04462 , 0.04374 , 0.04286 , 0.04198 , 0.0411 , 0.04022 , 0.03934 , 0.03846 , 0.03758 , 0.0367 , 0.03582 , 0.03494 , 0.03406 , 0.03318 , 0.0323 , 0.031575 , 0.03085 , 0.030125 , 0.0294 , 0.028675 , 0.02795 , 0.027225 , 0.0265 , 0.025775 , 0.02505 , 0.024325 , 0.0236 , 0.022875 , 0.02215 , 0.021425 , 0.0207 , 0.019975 , 0.01925 , 0.018525 , 0.0178 , 0.017215 , 0.01663 , 0.016045 , 0.01546 , 0.014875 , 0.01429 , 0.013705 , 0.01312 , 0.012535 , 0.01195 , 0.011365 , 0.01078 , 0.010195 , 0.00961 , 0.009025 , 0.00844 , 0.007855 , 0.00727 , 0.006685 , 0.0061 , 0.005795 , 0.00549 , 0.005185 , 0.00488 , 0.004575 , 0.00427 , 0.003965 , 0.00366 , 0.003355 , 0.00305 , 0.002745 , 0.00244 , 0.002135 , 0.00183 , 0.001525 , 0.00122 , 0.000915 , 0.00061 , 0.000305 , 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 , ],*/ + +EFFICIENCY_option: "wavelength", +EFFICIENCY_value1: [270.283, 275.527, 280.764, 287.476, 295.659, 303.816, 315.642, 330.401, 350.31, 371.686, 393.06, 413.696, 434.327, 463.797, 480.738, 497.68, 517.57, 533.03, 541.117, 553.624, 567.611, 582.334, 595.581, 610.299, 623.539, 636.774, 646.328, 657.349, 667.627, 676.435, 684.506, 692.57, 699.171, 706.502, 715.301, 721.164, 725.565, ], +EFFICIENCY_value2: [0.00221339, 0.00614939, 0.0154922, 0.0394553, 0.0972569, 0.17491, 0.258638, 0.317895, 0.346656, 0.346522, 0.338938, 0.327939, 0.297261, 0.249668, 0.216696, 0.190134, 0.165016, 0.129877, 0.101129, 0.0762112, 0.0613027, 0.0487768, 0.0379766, 0.0286182, 0.0204256, 0.013807, 0.00985503, 0.00637843, 0.00390992, 0.00250334, 0.00160279, 0.000940725, 0.000635973, 0.000389867, 0.000226347, 0.000149732, 0.000115336, ], RINDEX_option: "wavelength", RINDEX_value1: [60.0, 200.0, 380.0, 395.0, 410.0, 425.0, 440.0, 455.0, 470.0, 485.0, 500.0, 515.0, 530.0, 545.0, 560.0, 575.0, 590.0, 605.0, 620.0, 635.0, 650.0, 665.0, 680.0, 800.0, ], diff --git a/data/Watchman/OPTICS_Watchman.ratdb b/data/Watchman/OPTICS_Watchman.ratdb index 30246d95..eebcf9ab 100644 --- a/data/Watchman/OPTICS_Watchman.ratdb +++ b/data/Watchman/OPTICS_Watchman.ratdb @@ -9,9 +9,13 @@ valid_begin : [0, 0], valid_end : [0, 0], photocathode: 1, -EFFICIENCY_option: "wavelength", +/*EFFICIENCY_option: "wavelength", EFFICIENCY_value1: [ 227.0 , 228.0 , 229.0 , 230.0 , 231.0 , 232.0 , 233.0 , 234.0 , 235.0 , 236.0 , 237.0 , 238.0 , 239.0 , 240.0 , 241.0 , 242.0 , 243.0 , 244.0 , 245.0 , 246.0 , 247.0 , 248.0 , 249.0 , 250.0 , 251.0 , 252.0 , 253.0 , 254.0 , 255.0 , 256.0 , 257.0 , 258.0 , 259.0 , 260.0 , 261.0 , 262.0 , 263.0 , 264.0 , 265.0 , 266.0 , 267.0 , 268.0 , 269.0 , 270.0 , 271.0 , 272.0 , 273.0 , 274.0 , 275.0 , 276.0 , 277.0 , 278.0 , 279.0 , 280.0 , 281.0 , 282.0 , 283.0 , 284.0 , 285.0 , 286.0 , 287.0 , 288.0 , 289.0 , 290.0 , 291.0 , 292.0 , 293.0 , 294.0 , 295.0 , 296.0 , 297.0 , 298.0 , 299.0 , 300.0 , 301.0 , 302.0 , 303.0 , 304.0 , 305.0 , 306.0 , 307.0 , 308.0 , 309.0 , 310.0 , 311.0 , 312.0 , 313.0 , 314.0 , 315.0 , 316.0 , 317.0 , 318.0 , 319.0 , 320.0 , 321.0 , 322.0 , 323.0 , 324.0 , 325.0 , 326.0 , 327.0 , 328.0 , 329.0 , 330.0 , 331.0 , 332.0 , 333.0 , 334.0 , 335.0 , 336.0 , 337.0 , 338.0 , 339.0 , 340.0 , 341.0 , 342.0 , 343.0 , 344.0 , 345.0 , 346.0 , 347.0 , 348.0 , 349.0 , 350.0 , 351.0 , 352.0 , 353.0 , 354.0 , 355.0 , 356.0 , 357.0 , 358.0 , 359.0 , 360.0 , 361.0 , 362.0 , 363.0 , 364.0 , 365.0 , 366.0 , 367.0 , 368.0 , 369.0 , 370.0 , 371.0 , 372.0 , 373.0 , 374.0 , 375.0 , 376.0 , 377.0 , 378.0 , 379.0 , 380.0 , 381.0 , 382.0 , 383.0 , 384.0 , 385.0 , 386.0 , 387.0 , 388.0 , 389.0 , 390.0 , 391.0 , 392.0 , 393.0 , 394.0 , 395.0 , 396.0 , 397.0 , 398.0 , 399.0 , 400.0 , 401.0 , 402.0 , 403.0 , 404.0 , 405.0 , 406.0 , 407.0 , 408.0 , 409.0 , 410.0 , 411.0 , 412.0 , 413.0 , 414.0 , 415.0 , 416.0 , 417.0 , 418.0 , 419.0 , 420.0 , 421.0 , 422.0 , 423.0 , 424.0 , 425.0 , 426.0 , 427.0 , 428.0 , 429.0 , 430.0 , 431.0 , 432.0 , 433.0 , 434.0 , 435.0 , 436.0 , 437.0 , 438.0 , 439.0 , 440.0 , 441.0 , 442.0 , 443.0 , 444.0 , 445.0 , 446.0 , 447.0 , 448.0 , 449.0 , 450.0 , 451.0 , 452.0 , 453.0 , 454.0 , 455.0 , 456.0 , 457.0 , 458.0 , 459.0 , 460.0 , 461.0 , 462.0 , 463.0 , 464.0 , 465.0 , 466.0 , 467.0 , 468.0 , 469.0 , 470.0 , 471.0 , 472.0 , 473.0 , 474.0 , 475.0 , 476.0 , 477.0 , 478.0 , 479.0 , 480.0 , 481.0 , 482.0 , 483.0 , 484.0 , 485.0 , 486.0 , 487.0 , 488.0 , 489.0 , 490.0 , 491.0 , 492.0 , 493.0 , 494.0 , 495.0 , 496.0 , 497.0 , 498.0 , 499.0 , 500.0 , 501.0 , 502.0 , 503.0 , 504.0 , 505.0 , 506.0 , 507.0 , 508.0 , 509.0 , 510.0 , 511.0 , 512.0 , 513.0 , 514.0 , 515.0 , 516.0 , 517.0 , 518.0 , 519.0 , 520.0 , 521.0 , 522.0 , 523.0 , 524.0 , 525.0 , 526.0 , 527.0 , 528.0 , 529.0 , 530.0 , 531.0 , 532.0 , 533.0 , 534.0 , 535.0 , 536.0 , 537.0 , 538.0 , 539.0 , 540.0 , 541.0 , 542.0 , 543.0 , 544.0 , 545.0 , 546.0 , 547.0 , 548.0 , 549.0 , 550.0 , 551.0 , 552.0 , 553.0 , 554.0 , 555.0 , 556.0 , 557.0 , 558.0 , 559.0 , 560.0 , 561.0 , 562.0 , 563.0 , 564.0 , 565.0 , 566.0 , 567.0 , 568.0 , 569.0 , 570.0 , 571.0 , 572.0 , 573.0 , 574.0 , 575.0 , 576.0 , 577.0 , 578.0 , 579.0 , 580.0 , 581.0 , 582.0 , 583.0 , 584.0 , 585.0 , 586.0 , 587.0 , 588.0 , 589.0 , 590.0 , 591.0 , 592.0 , 593.0 , 594.0 , 595.0 , 596.0 , 597.0 , 598.0 , 599.0 , 600.0 , 601.0 , 602.0 , 603.0 , 604.0 , 605.0 , 606.0 , 607.0 , 608.0 , 609.0 , 610.0 , 611.0 , 612.0 , 613.0 , 614.0 , 615.0 , 616.0 , 617.0 , 618.0 , 619.0 , 620.0 , 621.0 , 622.0 , 623.0 , 624.0 , 625.0 , 626.0 , 627.0 , 628.0 , 629.0 , 630.0 , 631.0 , 632.0 , 633.0 , 634.0 , 635.0 , 636.0 , 637.0 , 638.0 , 639.0 , 640.0 , 641.0 , 642.0 , 643.0 , 644.0 , 645.0 , 646.0 , 647.0 , 648.0 , 649.0 , 650.0 , 651.0 , 652.0 , 653.0 , 654.0 , 655.0 , 656.0 , 657.0 , 658.0 , 659.0 , 660.0 , 661.0 , 662.0 , 663.0 , 664.0 , 665.0 , 666.0 , 667.0 , 668.0 , 669.0 , 670.0 , 671.0 , 672.0 , 673.0 , 674.0 , 675.0 , 676.0 , 677.0 , 678.0 , 679.0 , 680.0 , 681.0 , 682.0 , 683.0 , 684.0 , 685.0 , 686.0 , 687.0 , 688.0 , 689.0 , 690.0 , 691.0 , 692.0 , 693.0 , 694.0 , 695.0 , 696.0 , ], -EFFICIENCY_value2: [ 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 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.00251 , 0.00502 , 0.00753 , 0.01004 , 0.01255 , 0.01506 , 0.01757 , 0.02008 , 0.02259 , 0.0251 , 0.02761 , 0.03012 , 0.03263 , 0.03514 , 0.03765 , 0.04016 , 0.04267 , 0.04518 , 0.04769 , 0.0502 , 0.057775 , 0.06535 , 0.072925 , 0.0805 , 0.088075 , 0.09565 , 0.103225 , 0.1108 , 0.118375 , 0.12595 , 0.133525 , 0.1411 , 0.148675 , 0.15625 , 0.163825 , 0.1714 , 0.178975 , 0.18655 , 0.194125 , 0.2017 , 0.20628 , 0.21086 , 0.21544 , 0.22002 , 0.2246 , 0.22918 , 0.23376 , 0.23834 , 0.24292 , 0.2475 , 0.25208 , 0.25666 , 0.26124 , 0.26582 , 0.2704 , 0.27498 , 0.27956 , 0.28414 , 0.28872 , 0.2933 , 0.295165 , 0.29703 , 0.298895 , 0.30076 , 0.302625 , 0.30449 , 0.306355 , 0.30822 , 0.310085 , 0.31195 , 0.313815 , 0.31568 , 0.317545 , 0.31941 , 0.321275 , 0.32314 , 0.325005 , 0.32687 , 0.328735 , 0.3306 , 0.33105 , 0.3315 , 0.33195 , 0.3324 , 0.33285 , 0.3333 , 0.33375 , 0.3342 , 0.33465 , 0.3351 , 0.33555 , 0.336 , 0.33645 , 0.3369 , 0.33735 , 0.3378 , 0.33825 , 0.3387 , 0.33915 , 0.3396 , 0.33922 , 0.33884 , 0.33846 , 0.33808 , 0.3377 , 0.33732 , 0.33694 , 0.33656 , 0.33618 , 0.3358 , 0.33542 , 0.33504 , 0.33466 , 0.33428 , 0.3339 , 0.33352 , 0.33314 , 0.33276 , 0.33238 , 0.332 , 0.33124 , 0.33048 , 0.32972 , 0.32896 , 0.3282 , 0.32744 , 0.32668 , 0.32592 , 0.32516 , 0.3244 , 0.32364 , 0.32288 , 0.32212 , 0.32136 , 0.3206 , 0.31984 , 0.31908 , 0.31832 , 0.31756 , 0.3168 , 0.315535 , 0.31427 , 0.313005 , 0.31174 , 0.310475 , 0.30921 , 0.307945 , 0.30668 , 0.305415 , 0.30415 , 0.302885 , 0.30162 , 0.300355 , 0.29909 , 0.297825 , 0.29656 , 0.295295 , 0.29403 , 0.292765 , 0.2915 , 0.2902 , 0.2889 , 0.2876 , 0.2863 , 0.285 , 0.2837 , 0.2824 , 0.2811 , 0.2798 , 0.2785 , 0.2772 , 0.2759 , 0.2746 , 0.2733 , 0.272 , 0.2707 , 0.2694 , 0.2681 , 0.2668 , 0.2655 , 0.263565 , 0.26163 , 0.259695 , 0.25776 , 0.255825 , 0.25389 , 0.251955 , 0.25002 , 0.248085 , 0.24615 , 0.244215 , 0.24228 , 0.240345 , 0.23841 , 0.236475 , 0.23454 , 0.232605 , 0.23067 , 0.228735 , 0.2268 , 0.225315 , 0.22383 , 0.222345 , 0.22086 , 0.219375 , 0.21789 , 0.216405 , 0.21492 , 0.213435 , 0.21195 , 0.210465 , 0.20898 , 0.207495 , 0.20601 , 0.204525 , 0.20304 , 0.201555 , 0.20007 , 0.198585 , 0.1971 , 0.19545 , 0.1938 , 0.19215 , 0.1905 , 0.18885 , 0.1872 , 0.18555 , 0.1839 , 0.18225 , 0.1806 , 0.17895 , 0.1773 , 0.17565 , 0.174 , 0.17235 , 0.1707 , 0.16905 , 0.1674 , 0.16575 , 0.1641 , 0.161405 , 0.15871 , 0.156015 , 0.15332 , 0.150625 , 0.14793 , 0.145235 , 0.14254 , 0.139845 , 0.13715 , 0.134455 , 0.13176 , 0.129065 , 0.12637 , 0.123675 , 0.12098 , 0.118285 , 0.11559 , 0.112895 , 0.1102 , 0.108325 , 0.10645 , 0.104575 , 0.1027 , 0.100825 , 0.09895 , 0.097075 , 0.0952 , 0.093325 , 0.09145 , 0.089575 , 0.0877 , 0.085825 , 0.08395 , 0.082075 , 0.0802 , 0.078325 , 0.07645 , 0.074575 , 0.0727 , 0.07156 , 0.07042 , 0.06928 , 0.06814 , 0.067 , 0.06586 , 0.06472 , 0.06358 , 0.06244 , 0.0613 , 0.06016 , 0.05902 , 0.05788 , 0.05674 , 0.0556 , 0.05446 , 0.05332 , 0.05218 , 0.05104 , 0.0499 , 0.04902 , 0.04814 , 0.04726 , 0.04638 , 0.0455 , 0.04462 , 0.04374 , 0.04286 , 0.04198 , 0.0411 , 0.04022 , 0.03934 , 0.03846 , 0.03758 , 0.0367 , 0.03582 , 0.03494 , 0.03406 , 0.03318 , 0.0323 , 0.031575 , 0.03085 , 0.030125 , 0.0294 , 0.028675 , 0.02795 , 0.027225 , 0.0265 , 0.025775 , 0.02505 , 0.024325 , 0.0236 , 0.022875 , 0.02215 , 0.021425 , 0.0207 , 0.019975 , 0.01925 , 0.018525 , 0.0178 , 0.017215 , 0.01663 , 0.016045 , 0.01546 , 0.014875 , 0.01429 , 0.013705 , 0.01312 , 0.012535 , 0.01195 , 0.011365 , 0.01078 , 0.010195 , 0.00961 , 0.009025 , 0.00844 , 0.007855 , 0.00727 , 0.006685 , 0.0061 , 0.005795 , 0.00549 , 0.005185 , 0.00488 , 0.004575 , 0.00427 , 0.003965 , 0.00366 , 0.003355 , 0.00305 , 0.002745 , 0.00244 , 0.002135 , 0.00183 , 0.001525 , 0.00122 , 0.000915 , 0.00061 , 0.000305 , 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 , ], +EFFICIENCY_value2: [ 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 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.00251 , 0.00502 , 0.00753 , 0.01004 , 0.01255 , 0.01506 , 0.01757 , 0.02008 , 0.02259 , 0.0251 , 0.02761 , 0.03012 , 0.03263 , 0.03514 , 0.03765 , 0.04016 , 0.04267 , 0.04518 , 0.04769 , 0.0502 , 0.057775 , 0.06535 , 0.072925 , 0.0805 , 0.088075 , 0.09565 , 0.103225 , 0.1108 , 0.118375 , 0.12595 , 0.133525 , 0.1411 , 0.148675 , 0.15625 , 0.163825 , 0.1714 , 0.178975 , 0.18655 , 0.194125 , 0.2017 , 0.20628 , 0.21086 , 0.21544 , 0.22002 , 0.2246 , 0.22918 , 0.23376 , 0.23834 , 0.24292 , 0.2475 , 0.25208 , 0.25666 , 0.26124 , 0.26582 , 0.2704 , 0.27498 , 0.27956 , 0.28414 , 0.28872 , 0.2933 , 0.295165 , 0.29703 , 0.298895 , 0.30076 , 0.302625 , 0.30449 , 0.306355 , 0.30822 , 0.310085 , 0.31195 , 0.313815 , 0.31568 , 0.317545 , 0.31941 , 0.321275 , 0.32314 , 0.325005 , 0.32687 , 0.328735 , 0.3306 , 0.33105 , 0.3315 , 0.33195 , 0.3324 , 0.33285 , 0.3333 , 0.33375 , 0.3342 , 0.33465 , 0.3351 , 0.33555 , 0.336 , 0.33645 , 0.3369 , 0.33735 , 0.3378 , 0.33825 , 0.3387 , 0.33915 , 0.3396 , 0.33922 , 0.33884 , 0.33846 , 0.33808 , 0.3377 , 0.33732 , 0.33694 , 0.33656 , 0.33618 , 0.3358 , 0.33542 , 0.33504 , 0.33466 , 0.33428 , 0.3339 , 0.33352 , 0.33314 , 0.33276 , 0.33238 , 0.332 , 0.33124 , 0.33048 , 0.32972 , 0.32896 , 0.3282 , 0.32744 , 0.32668 , 0.32592 , 0.32516 , 0.3244 , 0.32364 , 0.32288 , 0.32212 , 0.32136 , 0.3206 , 0.31984 , 0.31908 , 0.31832 , 0.31756 , 0.3168 , 0.315535 , 0.31427 , 0.313005 , 0.31174 , 0.310475 , 0.30921 , 0.307945 , 0.30668 , 0.305415 , 0.30415 , 0.302885 , 0.30162 , 0.300355 , 0.29909 , 0.297825 , 0.29656 , 0.295295 , 0.29403 , 0.292765 , 0.2915 , 0.2902 , 0.2889 , 0.2876 , 0.2863 , 0.285 , 0.2837 , 0.2824 , 0.2811 , 0.2798 , 0.2785 , 0.2772 , 0.2759 , 0.2746 , 0.2733 , 0.272 , 0.2707 , 0.2694 , 0.2681 , 0.2668 , 0.2655 , 0.263565 , 0.26163 , 0.259695 , 0.25776 , 0.255825 , 0.25389 , 0.251955 , 0.25002 , 0.248085 , 0.24615 , 0.244215 , 0.24228 , 0.240345 , 0.23841 , 0.236475 , 0.23454 , 0.232605 , 0.23067 , 0.228735 , 0.2268 , 0.225315 , 0.22383 , 0.222345 , 0.22086 , 0.219375 , 0.21789 , 0.216405 , 0.21492 , 0.213435 , 0.21195 , 0.210465 , 0.20898 , 0.207495 , 0.20601 , 0.204525 , 0.20304 , 0.201555 , 0.20007 , 0.198585 , 0.1971 , 0.19545 , 0.1938 , 0.19215 , 0.1905 , 0.18885 , 0.1872 , 0.18555 , 0.1839 , 0.18225 , 0.1806 , 0.17895 , 0.1773 , 0.17565 , 0.174 , 0.17235 , 0.1707 , 0.16905 , 0.1674 , 0.16575 , 0.1641 , 0.161405 , 0.15871 , 0.156015 , 0.15332 , 0.150625 , 0.14793 , 0.145235 , 0.14254 , 0.139845 , 0.13715 , 0.134455 , 0.13176 , 0.129065 , 0.12637 , 0.123675 , 0.12098 , 0.118285 , 0.11559 , 0.112895 , 0.1102 , 0.108325 , 0.10645 , 0.104575 , 0.1027 , 0.100825 , 0.09895 , 0.097075 , 0.0952 , 0.093325 , 0.09145 , 0.089575 , 0.0877 , 0.085825 , 0.08395 , 0.082075 , 0.0802 , 0.078325 , 0.07645 , 0.074575 , 0.0727 , 0.07156 , 0.07042 , 0.06928 , 0.06814 , 0.067 , 0.06586 , 0.06472 , 0.06358 , 0.06244 , 0.0613 , 0.06016 , 0.05902 , 0.05788 , 0.05674 , 0.0556 , 0.05446 , 0.05332 , 0.05218 , 0.05104 , 0.0499 , 0.04902 , 0.04814 , 0.04726 , 0.04638 , 0.0455 , 0.04462 , 0.04374 , 0.04286 , 0.04198 , 0.0411 , 0.04022 , 0.03934 , 0.03846 , 0.03758 , 0.0367 , 0.03582 , 0.03494 , 0.03406 , 0.03318 , 0.0323 , 0.031575 , 0.03085 , 0.030125 , 0.0294 , 0.028675 , 0.02795 , 0.027225 , 0.0265 , 0.025775 , 0.02505 , 0.024325 , 0.0236 , 0.022875 , 0.02215 , 0.021425 , 0.0207 , 0.019975 , 0.01925 , 0.018525 , 0.0178 , 0.017215 , 0.01663 , 0.016045 , 0.01546 , 0.014875 , 0.01429 , 0.013705 , 0.01312 , 0.012535 , 0.01195 , 0.011365 , 0.01078 , 0.010195 , 0.00961 , 0.009025 , 0.00844 , 0.007855 , 0.00727 , 0.006685 , 0.0061 , 0.005795 , 0.00549 , 0.005185 , 0.00488 , 0.004575 , 0.00427 , 0.003965 , 0.00366 , 0.003355 , 0.00305 , 0.002745 , 0.00244 , 0.002135 , 0.00183 , 0.001525 , 0.00122 , 0.000915 , 0.00061 , 0.000305 , 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 , ],*/ + +EFFICIENCY_option: "wavelength", +EFFICIENCY_value1: [270.283, 275.527, 280.764, 287.476, 295.659, 303.816, 315.642, 330.401, 350.31, 371.686, 393.06, 413.696, 434.327, 463.797, 480.738, 497.68, 517.57, 533.03, 541.117, 553.624, 567.611, 582.334, 595.581, 610.299, 623.539, 636.774, 646.328, 657.349, 667.627, 676.435, 684.506, 692.57, 699.171, 706.502, 715.301, 721.164, 725.565, ], +EFFICIENCY_value2: [0.00221339, 0.00614939, 0.0154922, 0.0394553, 0.0972569, 0.17491, 0.258638, 0.317895, 0.346656, 0.346522, 0.338938, 0.327939, 0.297261, 0.249668, 0.216696, 0.190134, 0.165016, 0.129877, 0.101129, 0.0762112, 0.0613027, 0.0487768, 0.0379766, 0.0286182, 0.0204256, 0.013807, 0.00985503, 0.00637843, 0.00390992, 0.00250334, 0.00160279, 0.000940725, 0.000635973, 0.000389867, 0.000226347, 0.000149732, 0.000115336, ], RINDEX_option: "wavelength", RINDEX_value1: [60.0, 200.0, 380.0, 395.0, 410.0, 425.0, 440.0, 455.0, 470.0, 485.0, 500.0, 515.0, 530.0, 545.0, 560.0, 575.0, 590.0, 605.0, 620.0, 635.0, 650.0, 665.0, 680.0, 800.0, ], diff --git a/data/WatchmanSN/OPTICS_Watchman.ratdb b/data/WatchmanSN/OPTICS_Watchman.ratdb index 38d31406..029aff64 100644 --- a/data/WatchmanSN/OPTICS_Watchman.ratdb +++ b/data/WatchmanSN/OPTICS_Watchman.ratdb @@ -9,9 +9,13 @@ valid_begin : [0, 0], valid_end : [0, 0], photocathode: 1, -EFFICIENCY_option: "wavelength", +/*EFFICIENCY_option: "wavelength", EFFICIENCY_value1: [ 227.0 , 228.0 , 229.0 , 230.0 , 231.0 , 232.0 , 233.0 , 234.0 , 235.0 , 236.0 , 237.0 , 238.0 , 239.0 , 240.0 , 241.0 , 242.0 , 243.0 , 244.0 , 245.0 , 246.0 , 247.0 , 248.0 , 249.0 , 250.0 , 251.0 , 252.0 , 253.0 , 254.0 , 255.0 , 256.0 , 257.0 , 258.0 , 259.0 , 260.0 , 261.0 , 262.0 , 263.0 , 264.0 , 265.0 , 266.0 , 267.0 , 268.0 , 269.0 , 270.0 , 271.0 , 272.0 , 273.0 , 274.0 , 275.0 , 276.0 , 277.0 , 278.0 , 279.0 , 280.0 , 281.0 , 282.0 , 283.0 , 284.0 , 285.0 , 286.0 , 287.0 , 288.0 , 289.0 , 290.0 , 291.0 , 292.0 , 293.0 , 294.0 , 295.0 , 296.0 , 297.0 , 298.0 , 299.0 , 300.0 , 301.0 , 302.0 , 303.0 , 304.0 , 305.0 , 306.0 , 307.0 , 308.0 , 309.0 , 310.0 , 311.0 , 312.0 , 313.0 , 314.0 , 315.0 , 316.0 , 317.0 , 318.0 , 319.0 , 320.0 , 321.0 , 322.0 , 323.0 , 324.0 , 325.0 , 326.0 , 327.0 , 328.0 , 329.0 , 330.0 , 331.0 , 332.0 , 333.0 , 334.0 , 335.0 , 336.0 , 337.0 , 338.0 , 339.0 , 340.0 , 341.0 , 342.0 , 343.0 , 344.0 , 345.0 , 346.0 , 347.0 , 348.0 , 349.0 , 350.0 , 351.0 , 352.0 , 353.0 , 354.0 , 355.0 , 356.0 , 357.0 , 358.0 , 359.0 , 360.0 , 361.0 , 362.0 , 363.0 , 364.0 , 365.0 , 366.0 , 367.0 , 368.0 , 369.0 , 370.0 , 371.0 , 372.0 , 373.0 , 374.0 , 375.0 , 376.0 , 377.0 , 378.0 , 379.0 , 380.0 , 381.0 , 382.0 , 383.0 , 384.0 , 385.0 , 386.0 , 387.0 , 388.0 , 389.0 , 390.0 , 391.0 , 392.0 , 393.0 , 394.0 , 395.0 , 396.0 , 397.0 , 398.0 , 399.0 , 400.0 , 401.0 , 402.0 , 403.0 , 404.0 , 405.0 , 406.0 , 407.0 , 408.0 , 409.0 , 410.0 , 411.0 , 412.0 , 413.0 , 414.0 , 415.0 , 416.0 , 417.0 , 418.0 , 419.0 , 420.0 , 421.0 , 422.0 , 423.0 , 424.0 , 425.0 , 426.0 , 427.0 , 428.0 , 429.0 , 430.0 , 431.0 , 432.0 , 433.0 , 434.0 , 435.0 , 436.0 , 437.0 , 438.0 , 439.0 , 440.0 , 441.0 , 442.0 , 443.0 , 444.0 , 445.0 , 446.0 , 447.0 , 448.0 , 449.0 , 450.0 , 451.0 , 452.0 , 453.0 , 454.0 , 455.0 , 456.0 , 457.0 , 458.0 , 459.0 , 460.0 , 461.0 , 462.0 , 463.0 , 464.0 , 465.0 , 466.0 , 467.0 , 468.0 , 469.0 , 470.0 , 471.0 , 472.0 , 473.0 , 474.0 , 475.0 , 476.0 , 477.0 , 478.0 , 479.0 , 480.0 , 481.0 , 482.0 , 483.0 , 484.0 , 485.0 , 486.0 , 487.0 , 488.0 , 489.0 , 490.0 , 491.0 , 492.0 , 493.0 , 494.0 , 495.0 , 496.0 , 497.0 , 498.0 , 499.0 , 500.0 , 501.0 , 502.0 , 503.0 , 504.0 , 505.0 , 506.0 , 507.0 , 508.0 , 509.0 , 510.0 , 511.0 , 512.0 , 513.0 , 514.0 , 515.0 , 516.0 , 517.0 , 518.0 , 519.0 , 520.0 , 521.0 , 522.0 , 523.0 , 524.0 , 525.0 , 526.0 , 527.0 , 528.0 , 529.0 , 530.0 , 531.0 , 532.0 , 533.0 , 534.0 , 535.0 , 536.0 , 537.0 , 538.0 , 539.0 , 540.0 , 541.0 , 542.0 , 543.0 , 544.0 , 545.0 , 546.0 , 547.0 , 548.0 , 549.0 , 550.0 , 551.0 , 552.0 , 553.0 , 554.0 , 555.0 , 556.0 , 557.0 , 558.0 , 559.0 , 560.0 , 561.0 , 562.0 , 563.0 , 564.0 , 565.0 , 566.0 , 567.0 , 568.0 , 569.0 , 570.0 , 571.0 , 572.0 , 573.0 , 574.0 , 575.0 , 576.0 , 577.0 , 578.0 , 579.0 , 580.0 , 581.0 , 582.0 , 583.0 , 584.0 , 585.0 , 586.0 , 587.0 , 588.0 , 589.0 , 590.0 , 591.0 , 592.0 , 593.0 , 594.0 , 595.0 , 596.0 , 597.0 , 598.0 , 599.0 , 600.0 , 601.0 , 602.0 , 603.0 , 604.0 , 605.0 , 606.0 , 607.0 , 608.0 , 609.0 , 610.0 , 611.0 , 612.0 , 613.0 , 614.0 , 615.0 , 616.0 , 617.0 , 618.0 , 619.0 , 620.0 , 621.0 , 622.0 , 623.0 , 624.0 , 625.0 , 626.0 , 627.0 , 628.0 , 629.0 , 630.0 , 631.0 , 632.0 , 633.0 , 634.0 , 635.0 , 636.0 , 637.0 , 638.0 , 639.0 , 640.0 , 641.0 , 642.0 , 643.0 , 644.0 , 645.0 , 646.0 , 647.0 , 648.0 , 649.0 , 650.0 , 651.0 , 652.0 , 653.0 , 654.0 , 655.0 , 656.0 , 657.0 , 658.0 , 659.0 , 660.0 , 661.0 , 662.0 , 663.0 , 664.0 , 665.0 , 666.0 , 667.0 , 668.0 , 669.0 , 670.0 , 671.0 , 672.0 , 673.0 , 674.0 , 675.0 , 676.0 , 677.0 , 678.0 , 679.0 , 680.0 , 681.0 , 682.0 , 683.0 , 684.0 , 685.0 , 686.0 , 687.0 , 688.0 , 689.0 , 690.0 , 691.0 , 692.0 , 693.0 , 694.0 , 695.0 , 696.0 , ], -EFFICIENCY_value2: [ 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 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.00251 , 0.00502 , 0.00753 , 0.01004 , 0.01255 , 0.01506 , 0.01757 , 0.02008 , 0.02259 , 0.0251 , 0.02761 , 0.03012 , 0.03263 , 0.03514 , 0.03765 , 0.04016 , 0.04267 , 0.04518 , 0.04769 , 0.0502 , 0.057775 , 0.06535 , 0.072925 , 0.0805 , 0.088075 , 0.09565 , 0.103225 , 0.1108 , 0.118375 , 0.12595 , 0.133525 , 0.1411 , 0.148675 , 0.15625 , 0.163825 , 0.1714 , 0.178975 , 0.18655 , 0.194125 , 0.2017 , 0.20628 , 0.21086 , 0.21544 , 0.22002 , 0.2246 , 0.22918 , 0.23376 , 0.23834 , 0.24292 , 0.2475 , 0.25208 , 0.25666 , 0.26124 , 0.26582 , 0.2704 , 0.27498 , 0.27956 , 0.28414 , 0.28872 , 0.2933 , 0.295165 , 0.29703 , 0.298895 , 0.30076 , 0.302625 , 0.30449 , 0.306355 , 0.30822 , 0.310085 , 0.31195 , 0.313815 , 0.31568 , 0.317545 , 0.31941 , 0.321275 , 0.32314 , 0.325005 , 0.32687 , 0.328735 , 0.3306 , 0.33105 , 0.3315 , 0.33195 , 0.3324 , 0.33285 , 0.3333 , 0.33375 , 0.3342 , 0.33465 , 0.3351 , 0.33555 , 0.336 , 0.33645 , 0.3369 , 0.33735 , 0.3378 , 0.33825 , 0.3387 , 0.33915 , 0.3396 , 0.33922 , 0.33884 , 0.33846 , 0.33808 , 0.3377 , 0.33732 , 0.33694 , 0.33656 , 0.33618 , 0.3358 , 0.33542 , 0.33504 , 0.33466 , 0.33428 , 0.3339 , 0.33352 , 0.33314 , 0.33276 , 0.33238 , 0.332 , 0.33124 , 0.33048 , 0.32972 , 0.32896 , 0.3282 , 0.32744 , 0.32668 , 0.32592 , 0.32516 , 0.3244 , 0.32364 , 0.32288 , 0.32212 , 0.32136 , 0.3206 , 0.31984 , 0.31908 , 0.31832 , 0.31756 , 0.3168 , 0.315535 , 0.31427 , 0.313005 , 0.31174 , 0.310475 , 0.30921 , 0.307945 , 0.30668 , 0.305415 , 0.30415 , 0.302885 , 0.30162 , 0.300355 , 0.29909 , 0.297825 , 0.29656 , 0.295295 , 0.29403 , 0.292765 , 0.2915 , 0.2902 , 0.2889 , 0.2876 , 0.2863 , 0.285 , 0.2837 , 0.2824 , 0.2811 , 0.2798 , 0.2785 , 0.2772 , 0.2759 , 0.2746 , 0.2733 , 0.272 , 0.2707 , 0.2694 , 0.2681 , 0.2668 , 0.2655 , 0.263565 , 0.26163 , 0.259695 , 0.25776 , 0.255825 , 0.25389 , 0.251955 , 0.25002 , 0.248085 , 0.24615 , 0.244215 , 0.24228 , 0.240345 , 0.23841 , 0.236475 , 0.23454 , 0.232605 , 0.23067 , 0.228735 , 0.2268 , 0.225315 , 0.22383 , 0.222345 , 0.22086 , 0.219375 , 0.21789 , 0.216405 , 0.21492 , 0.213435 , 0.21195 , 0.210465 , 0.20898 , 0.207495 , 0.20601 , 0.204525 , 0.20304 , 0.201555 , 0.20007 , 0.198585 , 0.1971 , 0.19545 , 0.1938 , 0.19215 , 0.1905 , 0.18885 , 0.1872 , 0.18555 , 0.1839 , 0.18225 , 0.1806 , 0.17895 , 0.1773 , 0.17565 , 0.174 , 0.17235 , 0.1707 , 0.16905 , 0.1674 , 0.16575 , 0.1641 , 0.161405 , 0.15871 , 0.156015 , 0.15332 , 0.150625 , 0.14793 , 0.145235 , 0.14254 , 0.139845 , 0.13715 , 0.134455 , 0.13176 , 0.129065 , 0.12637 , 0.123675 , 0.12098 , 0.118285 , 0.11559 , 0.112895 , 0.1102 , 0.108325 , 0.10645 , 0.104575 , 0.1027 , 0.100825 , 0.09895 , 0.097075 , 0.0952 , 0.093325 , 0.09145 , 0.089575 , 0.0877 , 0.085825 , 0.08395 , 0.082075 , 0.0802 , 0.078325 , 0.07645 , 0.074575 , 0.0727 , 0.07156 , 0.07042 , 0.06928 , 0.06814 , 0.067 , 0.06586 , 0.06472 , 0.06358 , 0.06244 , 0.0613 , 0.06016 , 0.05902 , 0.05788 , 0.05674 , 0.0556 , 0.05446 , 0.05332 , 0.05218 , 0.05104 , 0.0499 , 0.04902 , 0.04814 , 0.04726 , 0.04638 , 0.0455 , 0.04462 , 0.04374 , 0.04286 , 0.04198 , 0.0411 , 0.04022 , 0.03934 , 0.03846 , 0.03758 , 0.0367 , 0.03582 , 0.03494 , 0.03406 , 0.03318 , 0.0323 , 0.031575 , 0.03085 , 0.030125 , 0.0294 , 0.028675 , 0.02795 , 0.027225 , 0.0265 , 0.025775 , 0.02505 , 0.024325 , 0.0236 , 0.022875 , 0.02215 , 0.021425 , 0.0207 , 0.019975 , 0.01925 , 0.018525 , 0.0178 , 0.017215 , 0.01663 , 0.016045 , 0.01546 , 0.014875 , 0.01429 , 0.013705 , 0.01312 , 0.012535 , 0.01195 , 0.011365 , 0.01078 , 0.010195 , 0.00961 , 0.009025 , 0.00844 , 0.007855 , 0.00727 , 0.006685 , 0.0061 , 0.005795 , 0.00549 , 0.005185 , 0.00488 , 0.004575 , 0.00427 , 0.003965 , 0.00366 , 0.003355 , 0.00305 , 0.002745 , 0.00244 , 0.002135 , 0.00183 , 0.001525 , 0.00122 , 0.000915 , 0.00061 , 0.000305 , 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 , ], +EFFICIENCY_value2: [ 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 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.0 , 0.00251 , 0.00502 , 0.00753 , 0.01004 , 0.01255 , 0.01506 , 0.01757 , 0.02008 , 0.02259 , 0.0251 , 0.02761 , 0.03012 , 0.03263 , 0.03514 , 0.03765 , 0.04016 , 0.04267 , 0.04518 , 0.04769 , 0.0502 , 0.057775 , 0.06535 , 0.072925 , 0.0805 , 0.088075 , 0.09565 , 0.103225 , 0.1108 , 0.118375 , 0.12595 , 0.133525 , 0.1411 , 0.148675 , 0.15625 , 0.163825 , 0.1714 , 0.178975 , 0.18655 , 0.194125 , 0.2017 , 0.20628 , 0.21086 , 0.21544 , 0.22002 , 0.2246 , 0.22918 , 0.23376 , 0.23834 , 0.24292 , 0.2475 , 0.25208 , 0.25666 , 0.26124 , 0.26582 , 0.2704 , 0.27498 , 0.27956 , 0.28414 , 0.28872 , 0.2933 , 0.295165 , 0.29703 , 0.298895 , 0.30076 , 0.302625 , 0.30449 , 0.306355 , 0.30822 , 0.310085 , 0.31195 , 0.313815 , 0.31568 , 0.317545 , 0.31941 , 0.321275 , 0.32314 , 0.325005 , 0.32687 , 0.328735 , 0.3306 , 0.33105 , 0.3315 , 0.33195 , 0.3324 , 0.33285 , 0.3333 , 0.33375 , 0.3342 , 0.33465 , 0.3351 , 0.33555 , 0.336 , 0.33645 , 0.3369 , 0.33735 , 0.3378 , 0.33825 , 0.3387 , 0.33915 , 0.3396 , 0.33922 , 0.33884 , 0.33846 , 0.33808 , 0.3377 , 0.33732 , 0.33694 , 0.33656 , 0.33618 , 0.3358 , 0.33542 , 0.33504 , 0.33466 , 0.33428 , 0.3339 , 0.33352 , 0.33314 , 0.33276 , 0.33238 , 0.332 , 0.33124 , 0.33048 , 0.32972 , 0.32896 , 0.3282 , 0.32744 , 0.32668 , 0.32592 , 0.32516 , 0.3244 , 0.32364 , 0.32288 , 0.32212 , 0.32136 , 0.3206 , 0.31984 , 0.31908 , 0.31832 , 0.31756 , 0.3168 , 0.315535 , 0.31427 , 0.313005 , 0.31174 , 0.310475 , 0.30921 , 0.307945 , 0.30668 , 0.305415 , 0.30415 , 0.302885 , 0.30162 , 0.300355 , 0.29909 , 0.297825 , 0.29656 , 0.295295 , 0.29403 , 0.292765 , 0.2915 , 0.2902 , 0.2889 , 0.2876 , 0.2863 , 0.285 , 0.2837 , 0.2824 , 0.2811 , 0.2798 , 0.2785 , 0.2772 , 0.2759 , 0.2746 , 0.2733 , 0.272 , 0.2707 , 0.2694 , 0.2681 , 0.2668 , 0.2655 , 0.263565 , 0.26163 , 0.259695 , 0.25776 , 0.255825 , 0.25389 , 0.251955 , 0.25002 , 0.248085 , 0.24615 , 0.244215 , 0.24228 , 0.240345 , 0.23841 , 0.236475 , 0.23454 , 0.232605 , 0.23067 , 0.228735 , 0.2268 , 0.225315 , 0.22383 , 0.222345 , 0.22086 , 0.219375 , 0.21789 , 0.216405 , 0.21492 , 0.213435 , 0.21195 , 0.210465 , 0.20898 , 0.207495 , 0.20601 , 0.204525 , 0.20304 , 0.201555 , 0.20007 , 0.198585 , 0.1971 , 0.19545 , 0.1938 , 0.19215 , 0.1905 , 0.18885 , 0.1872 , 0.18555 , 0.1839 , 0.18225 , 0.1806 , 0.17895 , 0.1773 , 0.17565 , 0.174 , 0.17235 , 0.1707 , 0.16905 , 0.1674 , 0.16575 , 0.1641 , 0.161405 , 0.15871 , 0.156015 , 0.15332 , 0.150625 , 0.14793 , 0.145235 , 0.14254 , 0.139845 , 0.13715 , 0.134455 , 0.13176 , 0.129065 , 0.12637 , 0.123675 , 0.12098 , 0.118285 , 0.11559 , 0.112895 , 0.1102 , 0.108325 , 0.10645 , 0.104575 , 0.1027 , 0.100825 , 0.09895 , 0.097075 , 0.0952 , 0.093325 , 0.09145 , 0.089575 , 0.0877 , 0.085825 , 0.08395 , 0.082075 , 0.0802 , 0.078325 , 0.07645 , 0.074575 , 0.0727 , 0.07156 , 0.07042 , 0.06928 , 0.06814 , 0.067 , 0.06586 , 0.06472 , 0.06358 , 0.06244 , 0.0613 , 0.06016 , 0.05902 , 0.05788 , 0.05674 , 0.0556 , 0.05446 , 0.05332 , 0.05218 , 0.05104 , 0.0499 , 0.04902 , 0.04814 , 0.04726 , 0.04638 , 0.0455 , 0.04462 , 0.04374 , 0.04286 , 0.04198 , 0.0411 , 0.04022 , 0.03934 , 0.03846 , 0.03758 , 0.0367 , 0.03582 , 0.03494 , 0.03406 , 0.03318 , 0.0323 , 0.031575 , 0.03085 , 0.030125 , 0.0294 , 0.028675 , 0.02795 , 0.027225 , 0.0265 , 0.025775 , 0.02505 , 0.024325 , 0.0236 , 0.022875 , 0.02215 , 0.021425 , 0.0207 , 0.019975 , 0.01925 , 0.018525 , 0.0178 , 0.017215 , 0.01663 , 0.016045 , 0.01546 , 0.014875 , 0.01429 , 0.013705 , 0.01312 , 0.012535 , 0.01195 , 0.011365 , 0.01078 , 0.010195 , 0.00961 , 0.009025 , 0.00844 , 0.007855 , 0.00727 , 0.006685 , 0.0061 , 0.005795 , 0.00549 , 0.005185 , 0.00488 , 0.004575 , 0.00427 , 0.003965 , 0.00366 , 0.003355 , 0.00305 , 0.002745 , 0.00244 , 0.002135 , 0.00183 , 0.001525 , 0.00122 , 0.000915 , 0.00061 , 0.000305 , 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 , ],*/ + +EFFICIENCY_option: "wavelength", +EFFICIENCY_value1: [270.283, 275.527, 280.764, 287.476, 295.659, 303.816, 315.642, 330.401, 350.31, 371.686, 393.06, 413.696, 434.327, 463.797, 480.738, 497.68, 517.57, 533.03, 541.117, 553.624, 567.611, 582.334, 595.581, 610.299, 623.539, 636.774, 646.328, 657.349, 667.627, 676.435, 684.506, 692.57, 699.171, 706.502, 715.301, 721.164, 725.565, ], +EFFICIENCY_value2: [0.00221339, 0.00614939, 0.0154922, 0.0394553, 0.0972569, 0.17491, 0.258638, 0.317895, 0.346656, 0.346522, 0.338938, 0.327939, 0.297261, 0.249668, 0.216696, 0.190134, 0.165016, 0.129877, 0.101129, 0.0762112, 0.0613027, 0.0487768, 0.0379766, 0.0286182, 0.0204256, 0.013807, 0.00985503, 0.00637843, 0.00390992, 0.00250334, 0.00160279, 0.000940725, 0.000635973, 0.000389867, 0.000226347, 0.000149732, 0.000115336, ], RINDEX_option: "wavelength", RINDEX_value1: [60.0, 200.0, 380.0, 395.0, 410.0, 425.0, 440.0, 455.0, 470.0, 485.0, 500.0, 515.0, 530.0, 545.0, 560.0, 575.0, 590.0, 605.0, 620.0, 635.0, 650.0, 665.0, 680.0, 800.0, ], diff --git a/data/Watchman_WLSP/Watchman_WLSP.geo b/data/Watchman_WLSP/Watchman_WLSP.geo index 00b3435e..fd018374 100644 --- a/data/Watchman_WLSP/Watchman_WLSP.geo +++ b/data/Watchman_WLSP/Watchman_WLSP.geo @@ -670,10 +670,10 @@ type: "wlsp", //WLS Plates are created using their own geometry factory, called pos_table: "WLSPINFO", //These values will be modified by the WatchmanWLSPSquareDetectorFactory -- Changes you make here will not be used if you use the detector factory (except for the z dimension)! -size: [245.0,245.0,12.7], //Half dimensions of the WLS box (in mm) -z: [-12.8,12.8], //Half dimension of the z extent of the PMT hole ***MUST be slightly larger than the z dimension of the plate!!!*** +size: [245.0,245.0,6.4], //Half dimensions of the WLS box (in mm) +z: [-6.5,6.5], #z: [-12.8,12.8], //Half dimension of the z extent of the PMT hole ***MUST be slightly larger than the z dimension of the plate!!!*** r_min: [0.0,0.0], //Should always be 0.0 (it is the minimum extent of the rotational solid used to subtract out the hole for the PMT) -r_max: [126.5,126.5], //The outer radius used for the subtracting the hole for the PMT +r_max: [40,40],#r_max: [126.5,126.5], //The outer radius used for the subtracting the hole for the PMT material: "eljen_WLSP", orientation: "manual", diff --git a/data/beta_decays.dat b/data/beta_decays.dat index 917a3740..d53cd41d 100644 --- a/data/beta_decays.dat +++ b/data/beta_decays.dat @@ -916,7 +916,7 @@ DECAY: 231Th 0.4000 0 0.2902 3 0.0172 0.0256 0.0586 0. 0. 0. 0. 0. 0. 0.7200 0 0.3074 2 0.0256 0.0586 0. 0. 0. 0. 0. 0. 0. 0.8400 0 0.2893 3 0.0093 0.0749 0.0181 0. 0. 0. 0. 0. 0. -0.9610 0 0.2081 4 0.0821 0.0172 0.0256 0.0586 0. 0. 0. 0. 0. 0. +0.9610 0 0.2081 4 0.0821 0.0172 0.0256 0.0586 0. 0. 0. 0. 0. 0.9860 0 0.1443 3 0.1631 0.0256 0.0586 0. 0. 0. 0. 0. 0. 0.9990 0 0.2174 3 0.0900 0.0256 0.0586 0. 0. 0. 0. 0. 0. 1.0001 1 0.3139 2 0.0685 0.0092 0. 0. 0. 0. 0. 0. 0. diff --git a/mac/mywatchman_visualize_geofile_lightcones.mac b/mac/mywatchman_visualize_geofile_lightcones.mac new file mode 100644 index 00000000..7d1a16d3 --- /dev/null +++ b/mac/mywatchman_visualize_geofile_lightcones.mac @@ -0,0 +1,45 @@ +/glg4debug/glg4param omit_muon_processes 1.0 +/glg4debug/glg4param omit_hadronic_processes 1.0 + +/rat/db/set DETECTOR experiment "Watchman" +/rat/db/set GEO[inner_pmts] light_cone 0 +/rat/db/set GEO[inner_pmts] encapsulation 1 +/rat/db/set GEO[inner_pmts] mu_metal 0 +/rat/db/set GEO[inner_pmts] orientation "manual" #can change to "point" to have PMTs point to center + +#light cone material parameters +#/rat/db/set GEO[inner_pmts] light_cone_material "aluminum" +#/rat/db/set GEO[inner_pmts] light_cone_surface "aluminum" + +#light cone dimensional parameters for optimized geometry +#/rat/db/set GEO[inner_pmts] light_cone_length 14 +#/rat/db/set GEO[inner_pmts] light_cone_innerradius 12.65 +#/rat/db/set GEO[inner_pmts] light_cone_outerradius 23 +#/rat/db/set GEO[inner_pmts] light_cone_thickness 0.2 + +#/rat/db/set DETECTOR detector_factory "Watchman" +/rat/db/set DETECTOR geo_file "Watchman/Watchman.geo" +/rat/db/set WATCHMAN_PARAMS photocathode_coverage 0.0005 + + +# Visualize the calibration source +#/rat/db/load Watchman/DecayChamber.geo +#/rat/db/set GEO[sourcecan] posz 10000.0 + +/run/initialize + +/vis/open OGLSQt +/vis/scene/create +/vis/scene/add/volume +/vis/sceneHandler/attach +/vis/viewer/set/upVector 0.0 0.0 1.0 +/vis/viewer/set/viewpointThetaPhi -90 135 +/vis/viewer/set/style s +/vis/viewer/flush + +## Cut a plane through the detector +/vis/viewer/addCutawayPlane 0 0 0 cm 1 0 0 +#/vis/viewer/addCutawayPlane 0 -100 0 cm 0 1 0 +#/vis/viewer/set/viewpointThetaPhi -90 0 +#/vis/viewer/zoomTo 10 +#/vis/viewer/panTo 10 0 diff --git a/mac/positron_watchman.mac b/mac/positron_watchman.mac new file mode 100644 index 00000000..3c53f555 --- /dev/null +++ b/mac/positron_watchman.mac @@ -0,0 +1,44 @@ +/glg4debug/glg4param omit_muon_processes 1.0 +/glg4debug/glg4param omit_hadronic_processes 1.0 + +/rat/db/set DETECTOR experiment "Watchman" +#/rat/db/set GEO[inner_pmts] light_cone 1 +/rat/db/set GEO[inner_pmts] encapsulation 1 +#/rat/db/set GEO[inner_pmts] mu_metal 1 +#/rat/db/set GEO[inner_pmts] orientation "manual" #can change to "point" to have PMTs point to center + +#light cone material parameters +#/rat/db/set GEO[inner_pmts] light_cone_material "aluminum" +#/rat/db/set GEO[inner_pmts] light_cone_surface "aluminum" + +#light cone dimensional parameters for optimized geometry +#/rat/db/set GEO[inner_pmts] light_cone_length 14 +#/rat/db/set GEO[inner_pmts] light_cone_innerradius 12.65 +#/rat/db/set GEO[inner_pmts] light_cone_outerradius 23 +#/rat/db/set GEO[inner_pmts] light_cone_thickness 0.2 + +/rat/db/set DETECTOR detector_factory "Watchman" +#/rat/db/set DETECTOR geo_file "Watchman/Watchman.geo" +/rat/db/set WATCHMAN_PARAMS photocathode_coverage 0.25 + +#/rat/db/set DETECTOR experiment "Watchman" +#/rat/db/set DETECTOR detector_factory "Watchman" + +/run/initialize + +# BEGIN EVENT LOOP +/rat/proc simpledaq +/rat/proc count +/rat/procset update 10 + +/rat/proclast outroot +/rat/procset file "watchman_positronCentre_OM.root" +#END EVENT LOOP + +#/generator/add combo gun2:point +/generator/add combo gun:point +/generator/vtx/set e+ 0 0 0 10 +/generator/pos/set 0 0 0 + +/run/beamOn 10 #100 + diff --git a/mac/positron_watchman2.mac b/mac/positron_watchman2.mac new file mode 100644 index 00000000..4ff698a9 --- /dev/null +++ b/mac/positron_watchman2.mac @@ -0,0 +1,47 @@ +/glg4debug/glg4param omit_muon_processes 1.0 +/glg4debug/glg4param omit_hadronic_processes 1.0 + +/rat/db/set DETECTOR experiment "Watchman" +/rat/db/set GEO[inner_pmts] light_cone 0 +/rat/db/set GEO[inner_pmts] pmt_model "r14374" #"ETEL" +#/rat/db/set GEO[inner_pmts] encapsulation 0 +#/rat/db/set GEO[inner_pmts] orientation "manual" #can change to "point" to have PMTs point to center + +#light cone material parameters +#/rat/db/set GEO[inner_pmts] light_cone_material "aluminum" +#/rat/db/set GEO[inner_pmts] light_cone_surface "aluminum" + +#light cone dimensional parameters for optimized geometry +#/rat/db/set GEO[inner_pmts] light_cone_length 14 +#/rat/db/set GEO[inner_pmts] light_cone_innerradius 12.65 +#/rat/db/set GEO[inner_pmts] light_cone_outerradius 23 +#/rat/db/set GEO[inner_pmts] light_cone_thickness 0.2 + +/rat/db/set DETECTOR detector_factory "Watchman" +#/rat/db/set DETECTOR geo_file "Watchman/Watchman.geo" +/rat/db/set WATCHMAN_PARAMS photocathode_coverage 0.05 #0.25 + +#/rat/db/set DETECTOR experiment "Watchman" +#/rat/db/set DETECTOR detector_factory "Watchman" + +/run/initialize + +# BEGIN EVENT LOOP +/rat/proc simpledaq +/rat/proc count +/rat/procset update 10 + +/rat/proclast outroot +/rat/procset file "watchman_positronCentre_3inch.root" +#/rat/procset file "watchman_positronCentre_3inch_500.root" +#END EVENT LOOP + +#/generator/add combo gun2:point +/generator/add combo gun:point +/generator/vtx/set e+ 0 0 0 10 +/generator/pos/set 0 0 0 + +/run/beamOn 10 +#/run/beamOn 500 + + diff --git a/mac/positron_watchman2_wls.mac b/mac/positron_watchman2_wls.mac new file mode 100644 index 00000000..50b1ff01 --- /dev/null +++ b/mac/positron_watchman2_wls.mac @@ -0,0 +1,49 @@ +/glg4debug/glg4param omit_muon_processes 1.0 +/glg4debug/glg4param omit_hadronic_processes 1.0 + +#/rat/db/set DETECTOR experiment "Watchman" +#ading the WLS plate: +/rat/db/set DETECTOR experiment "Watchman_WLSP" +/rat/db/set DETECTOR detector_factory "WatchmanWLSPSquare" +/rat/db/set GEO[inner_pmts] light_cone 0 +/rat/db/set GEO[inner_pmts] pmt_model "r14374" #"ETEL" +#/rat/db/set GEO[inner_pmts] encapsulation 0 +#/rat/db/set GEO[inner_pmts] orientation "manual" #can change to "point" to have PMTs point to center + +#light cone material parameters +#/rat/db/set GEO[inner_pmts] light_cone_material "aluminum" +#/rat/db/set GEO[inner_pmts] light_cone_surface "aluminum" + +#light cone dimensional parameters for optimized geometry +#/rat/db/set GEO[inner_pmts] light_cone_length 14 +#/rat/db/set GEO[inner_pmts] light_cone_innerradius 12.65 +#/rat/db/set GEO[inner_pmts] light_cone_outerradius 23 +#/rat/db/set GEO[inner_pmts] light_cone_thickness 0.2 + +#/rat/db/set DETECTOR detector_factory "Watchman" +###/rat/db/set DETECTOR geo_file "Watchman/Watchman.geo" +/rat/db/set WATCHMAN_PARAMS photocathode_coverage 0.02 #0.02#0.25 + +#/rat/db/set DETECTOR experiment "Watchman" +#/rat/db/set DETECTOR detector_factory "Watchman" + +/run/initialize + +# BEGIN EVENT LOOP +/rat/proc simpledaq +/rat/proc count +/rat/procset update 10 + +/rat/proclast outroot +/rat/procset file "watchman_positronCentre_3inch_wls20_50_50_halfinchTEST_3mmgapb.root" +#/rat/procset file "watchman_positronCentre_3inch_wls20_30_30_halfinchTEST_3mmgap.root" +#/rat/procset file "watchman_positronCentre_3inch_wls.root" +#END EVENT LOOP + +#/generator/add combo gun2:point +/generator/add combo gun:point +/generator/vtx/set e+ 0 0 0 10 +/generator/pos/set 0 0 0 + +/run/beamOn 20 + diff --git a/mac/vis_gen_demo/mywm_vis_gen_demo.mac b/mac/vis_gen_demo/mywm_vis_gen_demo.mac new file mode 100644 index 00000000..7d5cee95 --- /dev/null +++ b/mac/vis_gen_demo/mywm_vis_gen_demo.mac @@ -0,0 +1,86 @@ +# +# demo for watchman visualisation +# gary.smith@ed.ac.uk +# 2nd May 2020 +# +# To run do: +# $ rat - wm_vis_gen_demo.mac +# (NB the dash starts the visualiser) +# +# Then in the interaction session type one +# of the commands at the end of this file +# to generate one beam particle e.g. +# Session: /control/execute gen_promptPositron.mac +# +# Various generators can be demonstrated +# - see comments in the respective files +# +# To generate many beam particles just run the +# macro then do e.g. +# Session: /run/beamOn N +# where N is the number of particles you want + +##### +/glg4debug/glg4param omit_muon_processes 1.0 +/glg4debug/glg4param omit_hadronic_processes 1.0 + +# geometry +/rat/db/set DETECTOR experiment "Watchman" +/rat/db/set GEO[inner_pmts] light_cone 0 + +# using detector factory allows modifications to geometry +# (instead of using a geo file) +#/rat/db/set DETECTOR detector_factory "Watchman" +/rat/db/set DETECTOR geo_file "Watchman.geo" + +# using very very low photocoverage for fast viewing here +# (NB usual coverage is 0.20 - 0.30) +#/rat/db/set WATCHMAN_PARAMS photocathode_coverage 0.05 #0.001 + +# commented out means no veto PMTs +#/rat/db/set WATCHMAN_PARAMS veto_coverage 0.02 +##### + +/run/initialize + +#### +# visualisation +/vis/open OGLSQt +/vis/scene/create +/vis/scene/add/trajectories rich smooth +/tracking/storeTrajectory 1 +/tracking/FillPointCont 1 +/vis/scene/add/volume +/vis/scene/add/hits +/vis/scene/add/trajectories +/vis/sceneHandler/attach + +/vis/viewer/set/upVector 0.0 0.0 1.0 +/vis/viewer/set/viewpointThetaPhi -90 135 +/vis/viewer/set/style s +/vis/viewer/flush + +# remove some of the detector to +# allow better viewing inside +#/vis/viewer/addCutawayPlane 0 -100 0 cm 0 1 0 +/vis/viewer/addCutawayPlane 0 0 0 cm 1 0 0 +#### + +### +# generator options +# comment out or execute in the interactive session +# +#/control/execute gen_Li8.mac +#/control/execute gen_electron_gun_point.mac +#/control/execute gen_muon_point_1_GeV.mac +#/control/execute gen_promptPositron.mac +#/control/execute gen_pbomb.mac +#/control/execute gen_promptPositron.mac +# +### + +### +# running +# remove comment out symbol or execute in the interactive session +# + #/run/beamOn 20 diff --git a/mac/watchman_dev.mac b/mac/watchman_dev.mac index e76891f7..f1379062 100644 --- a/mac/watchman_dev.mac +++ b/mac/watchman_dev.mac @@ -17,6 +17,9 @@ ## Include noise (Before DAQ!) /rat/proc noise /rat/procset rate 3000.0 +/rat/procset lookback 1000.0 +/rat/procset lookforward 1000.0 +/rat/procset maxtime 1000000.0 /rat/procset nearhits 1 ## Use the SplitEVDAQ /rat/proc splitevdaq @@ -28,9 +31,10 @@ /rat/procset trigger_resolution 1.0 /rat/procset max_hit_time 1000000.0 /rat/procset pulse_width 100.0 +/rat/procset discriminator 0.25 /rat/proc count -/rat/procset update 10 +/rat/procset update 1000 # Use IO.default_output_filename /rat/proclast outroot diff --git a/myenv.sh b/myenv.sh new file mode 100644 index 00000000..b1e57820 --- /dev/null +++ b/myenv.sh @@ -0,0 +1,6 @@ +source /Disk/ds-sopa-personal/edrakopo/software_WATCHMAN/root_install/bin/thisroot.sh +source /Disk/ds-sopa-personal/edrakopo/software_WATCHMAN/geant_install/bin/geant4.sh +export LD_LIBRARY_PATH=/Disk/ds-sopa-personal/edrakopo/software_WATCHMAN/software_WATCHMAN/geant_install/lib:$LD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=/Disk/ds-sopa-personal/edrakopo/software_WATCHMAN/software_WATCHMAN/geant_install/lib:$DYLD_LIBRARY_PATH +source /Disk/ds-sopa-personal/edrakopo/software_WATCHMAN/rat-pac/ratpac.sh + diff --git a/src/daq/include/RAT/SplitEVDAQProc.hh b/src/daq/include/RAT/SplitEVDAQProc.hh index 2646f19a..4ca956dc 100644 --- a/src/daq/include/RAT/SplitEVDAQProc.hh +++ b/src/daq/include/RAT/SplitEVDAQProc.hh @@ -25,6 +25,7 @@ protected: double fTriggerResolution; double fLookback; double fMaxHitTime; + double fDiscriminator; int fPmtType; int fTriggerOnNoise; std::vector fSPECharge; diff --git a/src/daq/src/NoiseProc.cc b/src/daq/src/NoiseProc.cc index f908df90..d1a6122a 100644 --- a/src/daq/src/NoiseProc.cc +++ b/src/daq/src/NoiseProc.cc @@ -141,6 +141,7 @@ void NoiseProc::AddNoiseHit( DS::MCPMT* mcpmt, DS::PMTInfo* pmtinfo, photon->SetCharge( fPMTCharge[ pmtinfo->GetModel(mcpmt->GetID()) ]->PickCharge() ); + mcpmt->SortMCPhotons(); return; } @@ -215,6 +216,12 @@ void NoiseProc::SetD(std::string param, double value) fNoiseRate = value; else throw ParamInvalid(param, "Noise rate must be positive"); + else if(param == "lookback") + fLookback = abs(value); + else if(param == "lookforward") + fLookforward = abs(value); + else if(param == "maxtime") + fMaxTime = abs(value); else throw ParamUnknown(param); } diff --git a/src/daq/src/SplitEVDAQProc.cc b/src/daq/src/SplitEVDAQProc.cc index 5bf7b033..a1676e99 100644 --- a/src/daq/src/SplitEVDAQProc.cc +++ b/src/daq/src/SplitEVDAQProc.cc @@ -24,6 +24,7 @@ SplitEVDAQProc::SplitEVDAQProc() : Processor("splitevdaq") { fTriggerResolution = ldaq->GetD("trigger_resolution"); fLookback = ldaq->GetD("lookback"); fMaxHitTime = ldaq->GetD("max_hit_time"); + fDiscriminator = ldaq->GetD("discriminator"); fPmtType = ldaq->GetI("pmt_type"); fTriggerOnNoise = ldaq->GetI("trigger_on_noise"); } @@ -35,6 +36,13 @@ Processor::Result SplitEVDAQProc::DSEvent(DS::Root *ds) { // Not included yet // - Noise on the trigger pulse height, rise-time, etc // - Disciminator on charge (all hits assumed to trigger) + // Note on the discriminator mk-I. Right now each photon is presumed to + // deposit its charge instantaneously and independently, which is faster + // for simulations but is less accurate for events with multi-pe since + // we aren't summing the hits to create a PMT waveform. We should add this + // feature as an option to test the accuracy of this simplified model, noting + // that the feature will likely cause a slowdown when used because of its + // increased complexity. DS::MC *mc = ds->GetMC(); // Prune the previous EV branchs if one exists @@ -45,6 +53,7 @@ Processor::Result SplitEVDAQProc::DSEvent(DS::Root *ds) { for (int imcpmt=0; imcpmt < mc->GetMCPMTCount(); imcpmt++) { DS::MCPMT *mcpmt = mc->GetMCPMT(imcpmt); + mcpmt->SortMCPhotons(); if( mcpmt->GetType() != fPmtType ) continue; double lastTrigger = -100000.0; for(int pidx=0; pidx < mcpmt->GetMCPhotonCount(); pidx++) @@ -53,7 +62,10 @@ Processor::Result SplitEVDAQProc::DSEvent(DS::Root *ds) { // Do we want to trigger on noise hits? if( !fTriggerOnNoise && photon->IsDarkHit() ) continue; double time = photon->GetFrontEndTime(); + double charge = photon->GetCharge(); if (time > fMaxHitTime) continue; + // Pass discriminator threshold? + if (charge < fDiscriminator) continue; if (time > (lastTrigger + fPmtLockout)) { trigPulses.push_back(time); @@ -152,12 +164,16 @@ Processor::Result SplitEVDAQProc::DSEvent(DS::Root *ds) { } } } + // If the integrated charge in the trigger window is below discriminator + // threshold do not record the event. + if ( integratedCharge < fDiscriminator ) + pmtInEvent = false; std::sort(hitTimes.begin(), hitTimes.end()); if( pmtInEvent ) { DS::PMT* pmt = ev->AddNewPMT(); pmt->SetID(pmtID); - double true_hit_time = *std::min_element( hitTimes.begin(), hitTimes.end() ); + double true_hit_time = hitTimes[0]; // PMT Hit time relative to the trigger pmt->SetTime( true_hit_time - tt ); pmt->SetCharge( integratedCharge ); @@ -188,6 +204,8 @@ void SplitEVDAQProc::SetD(std::string param, double value) fLookback = value; else if( param == "max_hit_time" ) fMaxHitTime = value; + else if( param == "discriminator" ) + fDiscriminator = value; else throw ParamUnknown(param); } diff --git a/src/ds/include/RAT/DS/MCPMT.hh b/src/ds/include/RAT/DS/MCPMT.hh index dc9c0b28..68295332 100644 --- a/src/ds/include/RAT/DS/MCPMT.hh +++ b/src/ds/include/RAT/DS/MCPMT.hh @@ -43,8 +43,9 @@ public: } void RemoveMCPhoton(Int_t i){ photon.erase(photon.begin() + i); } void PruneMCPhoton() { photon.resize(0); } + void SortMCPhotons() { std::sort(photon.begin(), photon.end()); } - ClassDef(MCPMT, 1) + ClassDef(MCPMT, 2) protected: Int_t id; diff --git a/src/ds/include/RAT/DS/MCPhoton.hh b/src/ds/include/RAT/DS/MCPhoton.hh index 9e16d32d..8fbb4d49 100644 --- a/src/ds/include/RAT/DS/MCPhoton.hh +++ b/src/ds/include/RAT/DS/MCPhoton.hh @@ -75,7 +75,11 @@ public: virtual std::string GetProcess() const { return process; } virtual void SetProcess(const std::string &_process) { process = _process; } - ClassDef(MCPhoton, 2) + /** Operator overload **/ + bool operator < (const MCPhoton& mcp) const { return (frontEndTime < mcp.frontEndTime); } + bool operator > (const MCPhoton& mcp) const { return (frontEndTime > mcp.frontEndTime); } + + ClassDef(MCPhoton, 3) protected: Double_t hitTime; diff --git a/src/gen/include/RAT/BetaFunction.hh b/src/gen/include/RAT/BetaFunction.hh index 23c76cd0..a052b410 100644 --- a/src/gen/include/RAT/BetaFunction.hh +++ b/src/gen/include/RAT/BetaFunction.hh @@ -109,6 +109,8 @@ namespace RAT { private: + static void ThrowParsingException(std::string filename, std::string decayName); + bool isVerbose; bool isCulmulative; diff --git a/src/gen/src/BetaFunction.cc b/src/gen/src/BetaFunction.cc index c3f9c4bd..82209dba 100644 --- a/src/gen/src/BetaFunction.cc +++ b/src/gen/src/BetaFunction.cc @@ -5,6 +5,8 @@ #include #include +#include +#include namespace RAT { @@ -471,16 +473,17 @@ namespace RAT { bool iScan = true; while (iScan) { - fscanf(inputFile, "%f %d %f %d", &iBr, &iSpin, &W0, &nP); + bool parseSuccess = fscanf(inputFile, "%f %d %f %d", &iBr, &iSpin, &W0, &nP) == 4; SetBranches((double) iBr, iSpin, (double) W0); for (int j = 0; j < nReadGamma; j++) { - fscanf(inputFile, "%f", &eP[j]); + parseSuccess &= fscanf(inputFile, "%f", &eP[j]) == 1; if (eP[j] > 0.) SetGammas((double) eP[j]); } - fscanf(inputFile, "%f %f %f", &aC[0], &aC[1], &aC[2]); + parseSuccess &= fscanf(inputFile, "%f %f %f", &aC[0], &aC[1], &aC[2]) == 3; if (iBr >= 1.) - iScan = false; + { iScan = false; } + if(!parseSuccess) { ThrowParsingException(inputFileName, dName); } } } else if (iString == eProbe) { iRead = false; @@ -505,4 +508,14 @@ namespace RAT { printf("Error detected: %d \n", iFlag); } + void BetaFunction::ThrowParsingException(std::string filename, std::string decayName) { + G4Exception(__FILE__, + "BetaFunction Parser Error", FatalException, + ("failed to parse " + + decayName + + " in " + + filename).c_str() + ); + } + } // namespace RAT diff --git a/src/geo/src/WatchmanWLSPSquareDetectorFactory.cc b/src/geo/src/WatchmanWLSPSquareDetectorFactory.cc index 5c20484c..c405f5b5 100644 --- a/src/geo/src/WatchmanWLSPSquareDetectorFactory.cc +++ b/src/geo/src/WatchmanWLSPSquareDetectorFactory.cc @@ -476,11 +476,26 @@ namespace RAT { //This generates the geometry values for the WLS plates and their reflectors db->SetDArray("GEO","WLS_Plates","size",{(pmt_space/2.0)-10.0,(pmt_space/2.0)-10.0,wlsp->GetDArray("z")[1]}); - db->SetDArray("GEO","WLS_Plates","r_max",{rho_edge[1]+5.0,rho_edge[1]-15.0}); + //db->SetDArray("GEO","WLS_Plates","r_max",{rho_edge[1]+5.0,rho_edge[1]-15.0});//default for 10" PMT + db->SetDArray("GEO","WLS_Plates","r_max",{rho_edge[1]+4.0,rho_edge[1]-2.0}); //resulting in rmax=36+4=40, rmin=36-2.0=34 + //db->SetDArray("GEO","WLS_Plates","r_max",{rho_edge[1]+5.0,rho_edge[1]-1.0}); //resulting in rmax=36+5=41, rmin=36-1.0=35, 1mm gap + //db->SetDArray("GEO","WLS_Plates","r_max",{rho_edge[1]+6.0,rho_edge[1]-0.0}); //resulting in rmax=36+6=42, rmin=36-0.0=36, 2mm gap + //db->SetDArray("GEO","WLS_Plates","r_max",{rho_edge[1]+8.0,rho_edge[1]+2.0}); //resulting in rmax=36+8=44, rmin=36+2.0=38, 4mm gap db->SetDArray("GEO","WLS_Plates","r_min",{0.0,0.0}); - db->SetDArray("GEO","WLS_Plates","z",{-wlsp->GetDArray("z")[1]-1.0,wlsp->GetDArray("z")[1]+1.0}); - db->SetDArray("GEO","WLSP_reflector","inner_size",{(pmt_space/2.0)-10.0,(pmt_space/2.0)-10.0,wlsp->GetDArray("z")[1]+2.0}); - db->SetDArray("GEO","WLSP_reflector","outer_size",{(pmt_space/2.0)-10.0+2.0,(pmt_space/2.0)-10.0+2.0,wlsp->GetDArray("z")[1]}); + //db->SetDArray("GEO","WLS_Plates","z",{-wlsp->GetDArray("z")[1]-1.0,wlsp->GetDArray("z")[1]+1.0}); + db->SetDArray("GEO","WLS_Plates","z",{-6.4, 6.4}); //plate at: 10-6.4 = 3.6 mm for rmax and 10+6.4 = 16.4 mm fro rmin + // db->SetDArray("GEO","WLSP_reflector","inner_size",{(pmt_space/2.0)-10.0,(pmt_space/2.0)-10.0,wlsp->GetDArray("z")[1]+2.0}); + // db->SetDArray("GEO","WLSP_reflector","outer_size",{(pmt_space/2.0)-10.0+2.0,(pmt_space/2.0)-10.0+2.0,wlsp->GetDArray("z")[1]}); + info << "WLS plate size: x: "<<(pmt_space/2.0)-10.0<<" y: "<<(pmt_space/2.0)-10.0<<" z: "<GetDArray("z")[1]<<"\n"; + /* + db->SetDArray("GEO","WLS_Plates","size",{ 250.0, 250.0, wlsp->GetDArray("z")[1]}); + db->SetDArray("GEO","WLS_Plates","r_max",{38., 38.}); + db->SetDArray("GEO","WLS_Plates","r_min",{0.0,0.0}); + db->SetDArray("GEO","WLS_Plates","z",{-6.4, 6.4}); + //db->SetDArray("GEO","WLSP_reflector","inner_size",{(pmt_space/2.0)-10.0,(pmt_space/2.0)-10.0,wlsp->GetDArray("z")[1]+2.0}); + //db->SetDArray("GEO","WLSP_reflector","outer_size",{(pmt_space/2.0)-10.0+2.0,(pmt_space/2.0)-10.0+2.0,wlsp->GetDArray("z")[1]}); + info << "WLS plate size: x: "<<"250.0"<< "y: "<<"250.0"<< "z: "<GetDArray("z")[1]<<"\n"; + info<<"WLS r_max: "<<38.<<","<<38.<<" z "<<"-6.4, 6.4"<<"\n";*/ } else { //If the baseline detector configuration is used, more constant values are used. I still do this here rather than in the geo file because it reads in the PMT dimensions @@ -490,6 +505,7 @@ namespace RAT { db->SetDArray("GEO","WLS_Plates","z",{-wlsp->GetDArray("z")[1]-1.0,wlsp->GetDArray("z")[1]+1.0}); db->SetDArray("GEO","WLSP_reflector","inner_size",{240.0,240.0,wlsp->GetDArray("z")[1]+2.0}); db->SetDArray("GEO","WLSP_reflector","outer_size",{242.0,242.0,wlsp->GetDArray("z")[1]}); + info << "Baseline: WLS plate size: x: 240.0, y: 240.0, z: "<SetDArray("GEO","WLSP_reflector","inner_size",{(pmt_space/2.0)-8.0,(pmt_space/2.0)-8.0,wlspcover->GetDArray("z")[1]}); diff --git a/util/geoneutrino2ratdb_new.py b/util/geoneutrino2ratdb_new.py new file mode 100644 index 00000000..ef17f17f --- /dev/null +++ b/util/geoneutrino2ratdb_new.py @@ -0,0 +1,76 @@ +import numpy as np +import argparse +import json + +### Convert .csv files from Geoneutrinos.org into ratdb files to be read in by +### the IBD generator. + +def getargs(): + parser = argparse.ArgumentParser() + parser.add_argument('incsv', type=str) + parser.add_argument('--out', '-o', default='output.ratdb') + parser.add_argument('--comp', default='total', choices=['total', 'geo', 'reactor', 'closest']) + parser.add_argument('--comment', type=str) + parser.add_argument('--index', type=str, default='default') + parser.add_argument('--plot', action='store_true') + parser.add_argument('--subtract', type=str, default=None) + return parser.parse_args() + +def main(): + args = getargs() + energy, total, iaea, close, geo_u, geo_th = \ + np.loadtxt( args.incsv, skiprows=1, delimiter=',', unpack=True ) + + # Option to subtract off background + if args.subtract is not None: + energy, total_sub, iaea_sub, close_sub, geo_u_sub, geo_th_sub = \ + np.loadtxt( args.subtract, skiprows=1, delimiter=',', unpack=True ) + total = np.subtract(total, total_sub) + iaea = np.subtract(iaea, iaea_sub) + close = np.subtract(close, close_sub) + geo_u = np.subtract(geo_u, geo_u_sub) + geo_th = np.subtract(geo_th, geo_th_sub) + + ## From geonu docs, bin centers from 1.805 to 9.995 + #energy = np.linspace(0.005, 9.995, 1000) + flux = total + if args.comp == 'geo': + flux = geo_u + geo_th + if args.comp == 'reactor': + flux = iaea + if args.comp == 'closest': + flux = close + + binwidth = np.mean( np.diff(energy) ) + integratedFlux = np.sum(flux)*binwidth + #integratedFlux = np.sum(flux) + print(f'Binwidth: {binwidth}') + print(f'Integrated Flux: {integratedFlux}') + + with open(args.out, 'w') as ff: + ff.write(f'// {args.comment}\n') + ff.write(f'// Integrated Flux: {integratedFlux}\n') + ff.write('{\n') + ff.write('name: "IBD",\n') + ff.write(f'index: "{args.index}",\n') + ff.write('run_range: [0, 0],\n\n') + ff.write('apply_xs: 0,\n\n') + ff.write('emin: 0.005,\n') + ff.write('emax: 9.995,\n\n') + ff.write(f'spec_e: {np.array2string(energy, max_line_width=1000000, separator=",")},\n') + ff.write(f'spec_flux: {np.array2string(flux, max_line_width=1000000, separator=",")},\n') + ff.write('}\n\n') + + if args.plot: + import matplotlib.pyplot as plt + plt.step(energy, flux, where='mid', label=f'{args.index}: {integratedFlux} TNU') + plt.ylim(bottom=0) + plt.xlim(0, max(energy)) + plt.xlabel("Antineutrino energy (MeV)") + plt.ylabel("TNU / keV") + plt.legend() + plt.show() + + +if __name__ == '__main__': + main()