Merge branch 'main' into 'main'

GitHub workflow fix See merge request pyorbit3/virtual-accelerator!104
PyORBIT-Collaboration · Oct 10, 2024 · 3c0b73a · 3c0b73a
2 parents 8149064 + b9c6c1e
commit 3c0b73a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/virtaccl/site/SNS_Linac/va_config.json b/virtaccl/site/SNS_Linac/va_config.json
@@ -1909,7 +1909,7 @@
         "SCL_Mag:DCH17": {
             "PyORBIT_Name": "SCL_Mag:DCH17",
             "Power_Supply": "SCL_Mag:PS_DCH17",
-            "Polarity": -1
+            "Polarity": 1
         },
         "SCL_Mag:DCV17": {
             "PyORBIT_Name": "SCL_Mag:DCV17",
@@ -2029,22 +2029,22 @@
         "SCL_Mag:DCH29": {
             "PyORBIT_Name": "SCL_Mag:DCH29",
             "Power_Supply": "SCL_Mag:PS_DCH29",
-            "Polarity": -1
+            "Polarity": 1
         },
         "SCL_Mag:DCV29": {
             "PyORBIT_Name": "SCL_Mag:DCV29",
             "Power_Supply": "SCL_Mag:PS_DCV29",
-            "Polarity": -1
+            "Polarity": 1
         },
         "SCL_Mag:DCH30": {
             "PyORBIT_Name": "SCL_Mag:DCH30",
             "Power_Supply": "SCL_Mag:PS_DCH30",
-            "Polarity": -1
+            "Polarity": 1
         },
         "SCL_Mag:DCV30": {
             "PyORBIT_Name": "SCL_Mag:DCV30",
             "Power_Supply": "SCL_Mag:PS_DCV30",
-            "Polarity": -1
+            "Polarity": 1
         },
         "SCL_Mag:DCH31": {
             "PyORBIT_Name": "SCL_Mag:DCH31",

diff --git a/virtaccl/site/SNS_Linac/virtual_SNS_linac.py b/virtaccl/site/SNS_Linac/virtual_SNS_linac.py
@@ -105,10 +105,9 @@ def main():
             if n + 1 > part_num:
                 bunch_in.deleteParticleFast(n)
         bunch_in.compress()
+
     beam_current = args.beam_current / 1000  # Set the initial beam current in Amps.
     space_charge = args.space_charge
-    print("space charge check: ", space_charge)
-
     model = OrbitModel(debug=debug, save_bunch=save_bunch)
     model.define_custom_node(BPMclass.node_type, BPMclass.parameter_list, diagnostic=True)
     model.define_custom_node(WSclass.node_type, WSclass.parameter_list, diagnostic=True)