Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/pileup checks #318

Merged
merged 19 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
af8d4ac
Clean up local KToolbox objects after every event.
pslocum Aug 6, 2024
84111c8
Build on push to feature branch.
pslocum Aug 6, 2024
7d3da6e
Remove p8 generator from KToolbox after each event, and initialize Ka…
pslocum Aug 7, 2024
448be90
Check contents of KToolbox before deleting objects.
pslocum Aug 7, 2024
a55bf2b
Reconfigure KToolbox as it was intiialized, before ending a run. Thi…
pslocum Aug 7, 2024
fd19460
Temporary commit with LMC and Kass KToolbox handled separately. Ther…
pslocum Aug 9, 2024
2ef4018
Cleanup indenting etc.
pslocum Aug 9, 2024
cf2b089
Add config files for pileup checks. Presently the [generator] field …
pslocum Aug 9, 2024
dbd719b
If using custom LMC generator for e.g. pileup, set theta randomizatio…
pslocum Aug 15, 2024
002eeb9
Reconfigure pause for new track.
pslocum Aug 16, 2024
56fde4c
Reduce verbosity in LPF.
pslocum Aug 18, 2024
ed02880
Add avg fcyc in IF band to recorded event properties.
pslocum Aug 18, 2024
01fd9f3
Fix some indexing in recording multi-track event properties, and avoi…
pslocum Aug 18, 2024
f295b9a
fix bug if imported mode map goes goes outside bounds due to rounding…
jkgaison65 Aug 23, 2024
015bf6d
Initialize recorded average axial frequency at the beginning of a track.
pslocum Aug 29, 2024
336d0bd
Make mode normalization more generally applicable to cavity, waveguid…
pslocum Aug 29, 2024
85e41e7
Restore backward-compatible normalization factor of 1.0 for mode map …
pslocum Aug 29, 2024
a30fb46
Merge branch 'feature/pileupChecks' of github.com:project8/locust_mc …
jkgaison65 Aug 29, 2024
b6d2df2
Add conversion of E_cartesian to E_cylindrical in the Mode Map Import
jkgaison65 Sep 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build and Test Locust
on:
pull_request:
push:
branches: [master, develop]
branches: [master, develop, feature/pileupChecks]
tags: ['*']
workflow_dispatch:

Expand Down
4 changes: 4 additions & 0 deletions Config/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ configure_file( JustKass.xml.in JustKass.xml )
configure_file( JustKassFieldMap.xml.in JustKassFieldMap.xml )
configure_file( LocustKass_FreeSpace_Template.xml.in LocustKass_FreeSpace_Template.xml )
configure_file( LocustKass_Cavity_CCA.xml.in LocustKass_Cavity_CCA.xml )
configure_file( LocustKass_Cavity_CCA_Pileup.xml.in LocustKass_Cavity_CCA_Pileup.xml )
configure_file( LocustKass_Cavity_1GHz.xml.in LocustKass_Cavity_1GHz.xml )
configure_file( LocustWaveguideTemplate.json.in LocustWaveguideTemplate.json )
configure_file( LocustCavityCCA.json.in LocustCavityCCA.json )
configure_file( LocustCavityCCA_Pileup.json.in LocustCavityCCA_Pileup.json )
configure_file( LocustCavityCCA_ModeMapTest.json.in LocustCavityCCA_ModeMapTest.json )
configure_file( LocustCavityRectangular.json.in LocustCavityRectangular.json )
configure_file( LocustCavity1GHz.json.in LocustCavity1GHz.json )
Expand All @@ -27,13 +29,15 @@ set (EXAMPLE_CONFIGFILES
${CMAKE_CURRENT_BINARY_DIR}/JustKassFieldMap.xml
${CMAKE_CURRENT_BINARY_DIR}/LocustKass_FreeSpace_Template.xml
${CMAKE_CURRENT_BINARY_DIR}/LocustKass_Cavity_CCA.xml
${CMAKE_CURRENT_BINARY_DIR}/LocustKass_Cavity_CCA_Pileup.xml
${CMAKE_CURRENT_BINARY_DIR}/LocustKass_Cavity_1GHz.xml
FreeSpaceGeometry.xml
CavityGeometry_VTinyCoil.xml
CavityGeometry_V00_00_00.xml
${CMAKE_CURRENT_BINARY_DIR}/LocustWaveguideTemplate.json
${CMAKE_CURRENT_BINARY_DIR}/LocustCavityCCA.json
${CMAKE_CURRENT_BINARY_DIR}/LocustCavityCCA_ModeMapTest.json
${CMAKE_CURRENT_BINARY_DIR}/LocustCavityCCA_Pileup.json
${CMAKE_CURRENT_BINARY_DIR}/LocustCavityRectangular.json
${CMAKE_CURRENT_BINARY_DIR}/LocustCavity1GHz.json
${CMAKE_CURRENT_BINARY_DIR}/LocustFreeSpaceTemplate.json
Expand Down
69 changes: 69 additions & 0 deletions Config/LocustCavityCCA_Pileup.json.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"generators":
[
"cavity-signal",
"cavity-signal",
"cavity-signal",
"cavity-signal",
"cavity-signal",
"cavity-signal",
"cavity-signal",
"cavity-signal",
"cavity-signal",
"cavity-signal",
"lpf-fft",
"decimate-signal",
"digitizer"
],

"cavity-signal":
{
"transmitter": "kass-current",
"accumulate-truth-info": true,
"cavity-radius": 0.007,
"cavity-length": 0.1,
"back-reaction": "true",
"dho-cavity-frequency": 25.9e9,
"dho-time-resolution": 9.0e-11,
"dho-threshold-factor": 0.01,
"event-spacing-samples": 10,
"track-length": 0.5e-6,
"ks-starting-xpos-min": -0.005,
"ks-starting-xpos-max": 0.005,
"ks-starting-ypos-min": -0.005,
"ks-starting-ypos-max": 0.005,
"ks-starting-zpos-min": 0.0,
"ks-starting-zpos-max": 0.0,
"ks-starting-energy-min": 18600.0,
"ks-starting-energy-max": 18600.0,
"ks-starting-pitch-min": 87.0,
"ks-starting-pitch-max": 90.0,
"rectangular-waveguide": false,
"voltage-check": "false",
"lo-frequency": 25.9602e9,
"xml-filename": "${CMAKE_INSTALL_PREFIX}/config/LocustKass_Cavity_CCA_Pileup.xml"
},

"simulation":
{
"egg-filename": "${CMAKE_INSTALL_PREFIX}/output/locust_mc.egg",
"n-records": 1,
"record-size": 81920,
"acquisition-rate": 301,
"n-channels": 1
},

"gaussian-noise":
{
"noise-floor-psd": 2.76e-22,
"domain": "time"
},

"digitizer":
{
"v-range": 0.08,
"v-offset": -0.04
}

}

Loading
Loading