forked from JeffersonLab/japan-MOLLER
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Modifed the mock data generator to use "mock_parameter" files for all
subsystems. The detector array mock parameters (such as the beam correlations) were split out of the pedestal files, and new functions were written to read them in for the mock data generator. The main branch and the new branch were tested for consistent output results: first we needed to make sure the beam variation ranges were consistent, and then that the detector array correlations were defined to the same decimal precision in the two branches. ==================================== Squashed commit of the following: commit 9b7a258 Author: Paul King <[email protected]> Date: Fri Oct 4 15:09:29 2024 -0400 Regenerated the detector mock parameter files from the "pedestal" files in the main branch, to ensure that the correlation parameters have the same precision and values in the two branches, for ease of comparing the mock data generation and analysis. commit eca6855 Merge: b2776e5 c084d16 Author: Paul King <[email protected]> Date: Fri Sep 20 09:58:06 2024 -0400 Merge branch 'feature-MockParamFileChange' of github.com:idebord/japan-MOLLER into idebord-feature-MockParamFileChange commit c084d16 Merge: 14ed46e 31600d5 Author: Isaac DeBord <[email protected]> Date: Fri Jul 19 17:02:45 2024 -0400 Merge branch 'main' into feature-MockParamFileChange commit 31600d5 Merge: c389700 4c8ff65 Author: Isaac DeBord <[email protected]> Date: Fri Jul 19 12:46:33 2024 -0400 Merge branch 'JeffersonLab:main' into main commit 14ed46e Author: Isaac DeBord <[email protected]> Date: Wed Jul 17 09:59:43 2024 -0400 Window period commit a6a938d Author: Isaac DeBord <[email protected]> Date: Mon Jul 15 16:10:15 2024 -0400 Detector array mock-parameter files commit 058e09d Author: Isaac DeBord <[email protected]> Date: Mon Jul 15 15:41:09 2024 -0400 Parameter change commit 16c3d60 Author: Isaac DeBord <[email protected]> Date: Mon Jul 15 14:57:45 2024 -0400 Parameter file split commit 5e1ac4c Author: Isaac DeBord <[email protected]> Date: Thu Jul 11 16:06:55 2024 -0400 Updated LoadMockDataParameters function commit 07fc5c0 Author: Isaac DeBord <[email protected]> Date: Wed Jul 10 11:21:18 2024 -0400 Updated LoadMockDataParameters function commit 3fac565 Merge: 99f64e9 990b8dd Author: Isaac DeBord <[email protected]> Date: Fri Jun 28 14:27:25 2024 -0400 Merge branch 'feature-updated-halla-beamline' of https://github.com/JeffersonLab/japan-MOLLER into test-new-halla-beamline commit 990b8dd Author: Paul King <[email protected]> Date: Fri Jun 28 12:16:24 2024 -0400 Changed the mock data injector beamline channel gains from 1 to ~76e-6. This is to make sure the mock data values are a better match to what we would expect. NOTE: this is still using the VQWK-era ADC gain value, and we should determine what the updated value ought to be for the MOLLER ADCs and change it throught the mapfiles. commit 140b754 Author: Paul King <[email protected]> Date: Fri Jun 28 12:11:19 2024 -0400 Added a new set of mock-data parameter files for the Hall A beamline, and increased the maximum size of the ROOT branch vector. The mock_moller_beamline* map files have the device names and locations for the Hall A beamline elements based on MOLLER DocDB 1071-v5. This increased the number of variables in the root files, and we needed to increase the maximum size of the ROOT branch vector to avoid run-time errors. The standard mock data detector map and the mock data parameter file have been changed to match. commit c389700 Merge: 99f64e9 fc3d65e Author: Isaac DeBord <[email protected]> Date: Fri Jun 21 09:52:08 2024 -0400 Merge branch 'JeffersonLab:main' into main commit 99f64e9 Author: Isaac DeBord <[email protected]> Date: Thu Jun 13 10:49:06 2024 -0400 Fix injector data commit 0a32b9c Author: Isaac DeBord <[email protected]> Date: Thu Jun 13 10:47:01 2024 -0400 Fix injector data and add parameters
- Loading branch information
Showing
22 changed files
with
947 additions
and
400 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
! Name Offset Gain NormRate(Hz/uA) VoltPerHz Asym C_x C_y C_xp C_yp | ||
C_e | ||
LA01 5500000000 1.09E-11 0.0001 1.000000 0.000000 10000.000000 0.000000 1000.000000 | ||
LA02 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
LA03 5500000000 1.09E-11 0.0001 1.000000 0.000000 10002.000000 0.000000 1000.000000 | ||
LA04 5500000000 1.09E-11 0.0001 1.000000 0.000000 10003.000000 0.000000 1000.000000 | ||
LA05 5500000000 1.09E-11 0.0001 0.997204 -0.074730 9972.037972 -747.375666 1000.000000 | ||
LA06 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
LA07 5500000000 1.09E-11 0.0001 0.997204 0.074730 9974.032379 747.525126 1000.000000 | ||
LA08 5500000000 1.09E-11 0.0001 1.000000 0.000000 10004.000000 0.000000 1000.000000 | ||
|
||
LA09 5500000000 1.09E-11 0.0001 1.000000 0.000000 10000.000000 0.000000 1000.000000 | ||
LA10 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
LA11 5500000000 1.09E-11 0.0001 1.000000 0.000000 10002.000000 0.000000 1000.000000 | ||
LA12 5500000000 1.09E-11 0.0001 1.000000 0.000000 10003.000000 0.000000 1000.000000 | ||
LA13 5500000000 1.09E-11 0.0001 0.997204 -0.074730 9972.037972 -747.375666 1000.000000 | ||
LA14 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
LA15 5500000000 1.09E-11 0.0001 0.997204 0.074730 9974.032379 747.525126 1000.000000 | ||
LA16 5500000000 1.09E-11 0.0001 1.000000 0.000000 10004.000000 0.000000 1000.000000 | ||
|
||
LA17 5500000000 1.09E-11 0.0001 1.000000 0.000000 10000.000000 0.000000 1000.000000 | ||
LA18 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
LA19 5500000000 1.09E-11 0.0001 1.000000 0.000000 10002.000000 0.000000 1000.000000 | ||
LA20 5500000000 1.09E-11 0.0001 1.000000 0.000000 10003.000000 0.000000 1000.000000 | ||
LA21 5500000000 1.09E-11 0.0001 0.997204 -0.074730 9972.037972 -747.375666 1000.000000 | ||
LA22 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
LA23 5500000000 1.09E-11 0.0001 0.997204 0.074730 9974.032379 747.525126 1000.000000 | ||
LA24 5500000000 1.09E-11 0.0001 1.000000 0.000000 10004.000000 0.000000 1000.000000 | ||
|
||
LA25 5500000000 1.09E-11 0.0001 1.000000 0.000000 10000.000000 0.000000 1000.000000 | ||
LA26 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
LA27 5500000000 1.09E-11 0.0001 1.000000 0.000000 10002.000000 0.000000 1000.000000 | ||
LA28 5500000000 1.09E-11 0.0001 1.000000 0.000000 10003.000000 0.000000 1000.000000 | ||
LA29 5500000000 1.09E-11 0.0001 0.997204 -0.074730 9972.037972 -747.375666 1000.000000 | ||
LA30 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
LA31 5500000000 1.09E-11 0.0001 0.997204 0.074730 9974.032379 747.525126 1000.000000 | ||
LA32 5500000000 1.09E-11 0.0001 1.000000 0.000000 10004.000000 0.000000 1000.000000 | ||
|
||
LA33 5500000000 1.09E-11 0.0001 1.000000 0.000000 10000.000000 0.000000 1000.000000 | ||
LA34 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
LA35 5500000000 1.09E-11 0.0001 1.000000 0.000000 10002.000000 0.000000 1000.000000 | ||
LA36 5500000000 1.09E-11 0.0001 1.000000 0.000000 10003.000000 0.000000 1000.000000 | ||
LA37 5500000000 1.09E-11 0.0001 0.997204 -0.074730 9972.037972 -747.375666 1000.000000 | ||
LA38 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
LA39 5500000000 1.09E-11 0.0001 0.997204 0.074730 9974.032379 747.525126 1000.000000 | ||
LA40 5500000000 1.09E-11 0.0001 1.000000 0.000000 10004.000000 0.000000 1000.000000 | ||
|
||
LA41 5500000000 1.09E-11 0.0001 1.000000 0.000000 10000.000000 0.000000 1000.000000 | ||
LA42 5500000000 1.09E-11 0.0001 1.000000 0.000000 10001.000000 0.000000 1000.000000 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# This is the detectors map used for VQWK checks | ||
|
||
window_period = 1e-3 | ||
|
||
#window_period = 520.85e-6 | ||
|
||
[QwBeamLine] | ||
name = Main BeamLine | ||
mock_param = mock_parameters_beamline.map | ||
|
||
[QwBeamLine] | ||
name = Injector BeamLine | ||
mock_param = mock_parameters_mollinj.map | ||
|
||
[QwDetectorArray] | ||
name = Thin Quartz Detector | ||
mock_param = mock_parameters_thinqtz.map | ||
|
||
[QwDetectorArray] | ||
name = Shower Max Detector | ||
mock_param = mock_parameters_shrmax.map | ||
|
||
[QwDetectorArray] | ||
name = Pion Detector | ||
mock_param = mock_parameters_piondet.map | ||
|
||
[QwDetectorArray] | ||
name = Small Angle Detector | ||
mock_param = mock_parameters_smallang.map | ||
|
||
[QwDetectorArray] | ||
name = Large Angle Detector | ||
mock_param = mock_parameters_largeang.map | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
!Injector beam line elements | ||
|
||
bpmstripline, bpm0i01a 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0i01 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0i02a 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0i02 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0i05 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0i07 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0l01 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0l02 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0l03 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0l04 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0l05 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0l06 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0l07 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0l08 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0l09 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm0l10 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm1i02 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm1i04 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm1i06 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm2i01 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 | ||
bpmstripline, bpm2i02 1.0e-3, 6.0, 3.0e-3, 1.0e-3, -1.5, 4.0e-3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
! Name Offset Gain NormRate(Hz/uA) VoltPerHz Asym C_x C_y C_xp C_yp | ||
C_e | ||
PD01 5500000000 1.09E-11 0.0001 1.00000000000 0.000000000000 10000.000000 0.0000000000 1000.000000 | ||
PD02 5500000000 1.09E-11 0.0001 0.98838261550 -0.15198620150 9883.8261550 -5586.823083 1000.000000 | ||
PD03 5500000000 1.09E-11 0.0001 0.95380038910 -0.30044103880 9538.0038910 -3004.410388 1000.000000 | ||
PD04 5500000000 1.09E-11 0.0001 0.89705683090 -0.44191519790 8970.5683090 -4419.151979 1000.000000 | ||
PD05 5500000000 1.09E-11 0.0001 0.81947036440 -0.57312155940 8194.7036440 -5731.215594 1000.000000 | ||
PD06 5500000000 1.09E-11 0.0001 0.72284369330 -0.69101157380 7228.4369330 -6910.115738 1000.000000 | ||
PD07 5500000000 1.09E-11 0.0001 0.60942191580 -0.79284609390 6094.2191580 -7928.460939 1000.000000 | ||
PD08 5500000000 1.09E-11 0.0001 0.48184036080 -0.87625901800 4818.4036080 -8762.590180 1000.000000 | ||
PD09 5500000000 1.09E-11 0.0001 0.34306335640 -0.93931226630 3430.6335640 -9393.122663 1000.000000 | ||
PD10 5500000000 1.09E-11 0.0001 0.19631535400 -0.98054081090 1963.1535400 -9805.408109 1000.000000 | ||
PD11 5500000000 1.09E-11 0.0001 0.04500600975 -0.99898671620 450.06009750 -9989.867162 1000.000000 | ||
PD12 5500000000 1.09E-11 0.0001 -0.1073490388 -0.99422139580 -1073.490388 -9942.213958 1000.000000 | ||
PD13 5500000000 1.09E-11 0.0001 -0.2572098571 -0.96635557090 -2572.098571 -9663.555709 1000.000000 | ||
PD14 5500000000 1.09E-11 0.0001 -0.4010944639 -0.91603669740 -4010.944639 -9160.366974 1000.000000 | ||
PD15 5500000000 1.09E-11 0.0001 -0.5356597334 -0.84443392280 -5356.597334 -8444.339228 1000.000000 | ||
PD16 5500000000 1.09E-11 0.0001 -0.6577790726 -0.75321092110 -6577.790726 -7532.109211 1000.000000 | ||
PD17 5500000000 1.09E-11 0.0001 -0.7646150671 -0.64448723740 -7646.150671 -6444.872374 1000.000000 | ||
PD18 5500000000 1.09E-11 0.0001 -0.8536854070 -0.52078904170 -8536.854070 -5207.890417 1000.000000 | ||
PD19 5500000000 1.09E-11 0.0001 -0.9229205636 -0.38499043280 -9229.205636 -3849.904328 1000.000000 | ||
PD20 5500000000 1.09E-11 0.0001 -0.9707118740 -0.24024666010 -9707.118740 -2402.466601 1000.000000 | ||
PD21 5500000000 1.09E-11 0.0001 -0.9959489182 -0.08992081178 -9959.489182 -899.2081178 1000.000000 | ||
PD22 5500000000 1.09E-11 0.0001 -0.9980453192 0.062494325870 -9980.453192 624.94325870 1000.000000 | ||
PD23 5500000000 1.09E-11 0.0001 -0.9769523678 0.213457422300 -9769.523678 2134.5742230 1000.000000 | ||
PD24 5500000000 1.09E-11 0.0001 -0.9331601536 0.359460884800 -9331.601536 3594.6088480 1000.000000 | ||
PD25 5500000000 1.09E-11 0.0001 -0.8676861788 0.497112356600 -8676.861788 4971.1235660 1000.000000 | ||
PD26 5500000000 1.09E-11 0.0001 -0.7820517160 0.623213537700 -7820.517160 6232.1353770 1000.000000 | ||
PD27 5500000000 1.09E-11 0.0001 -0.6782464621 0.734834496100 -6782.464621 7348.3449610 1000.000000 | ||
PD28 5500000000 1.09E-11 0.0001 -0.5586823083 0.829381744700 -5586.823083 8293.8174470 1000.000000 |
Oops, something went wrong.