xcoll 0.5.11__py3-none-any.whl → 0.6.0__py3-none-any.whl

xcoll/beam_elements/elements_src/black_absorber.h

@@ -24,65 +24,60 @@ int8_t BlackAbsorberData_get_record_scatterings(BlackAbsorberData el){
 
 
 /*gpufun*/
-CollimatorGeometry BlackAbsorber_init_geometry(BlackAbsorberData el, LocalParticle* part0, int8_t active){
+CollimatorGeometry BlackAbsorber_init_geometry(BlackAbsorberData el, LocalParticle* part0){
     CollimatorGeometry cg = (CollimatorGeometry) malloc(sizeof(CollimatorGeometry_));
-    if (active){ // This is needed in order to avoid that the initialisation is called during a twiss!
-        // Jaw corners (with tilts)
-        cg->jaw_LU = BlackAbsorberData_get__jaw_LU(el);
-        cg->jaw_RU = BlackAbsorberData_get__jaw_RU(el);
-        // Get angles of jaws
-        cg->sin_zL = BlackAbsorberData_get__sin_zL(el);
-        cg->cos_zL = BlackAbsorberData_get__cos_zL(el);
-        cg->sin_zR = BlackAbsorberData_get__sin_zR(el);
-        cg->cos_zR = BlackAbsorberData_get__cos_zR(el);
-        cg->sin_zDiff = BlackAbsorberData_get__sin_zDiff(el);
-        cg->cos_zDiff = BlackAbsorberData_get__cos_zDiff(el);
-        cg->jaws_parallel = BlackAbsorberData_get__jaws_parallel(el);
-        // Tilts
-        cg->sin_yL = BlackAbsorberData_get__sin_yL(el);
-        cg->cos_yL = BlackAbsorberData_get__cos_yL(el);
-        cg->sin_yR = BlackAbsorberData_get__sin_yR(el);
-        cg->cos_yR = BlackAbsorberData_get__cos_yR(el);
-        // Length and segments
-        cg->length = BlackAbsorberData_get_length(el);
-        cg->side   = BlackAbsorberData_get__side(el);
-        double s_U, s_D, x_D;
-        if (cg->side != -1){
-            s_U = cg->length/2 * (1-cg->cos_yL);
-            s_D = cg->length/2 * (1+cg->cos_yL);
-            x_D = BlackAbsorberData_get__jaw_LD(el);
-            cg->segments_L = create_jaw(s_U, cg->jaw_LU, s_D, x_D, cg->sin_yL/cg->cos_yL, 1);
-        }
-        if (cg->side != 1){
-            s_U = cg->length/2 * (1-cg->cos_yR);
-            s_D = cg->length/2 * (1+cg->cos_yR);
-            x_D = BlackAbsorberData_get__jaw_RD(el);
-            cg->segments_R = create_jaw(s_U, cg->jaw_RU, s_D, x_D, cg->sin_yR/cg->cos_yR, -1);
-        }
-        // Impact table
-        cg->record = BlackAbsorberData_getp_internal_record(el, part0);
-        cg->record_index = NULL;
-        cg->record_impacts = 0;
-        cg->record_exits = 0;
-        if (cg->record){
-            cg->record_index = InteractionRecordData_getp__index(cg->record);
-            cg->record_impacts = BlackAbsorberData_get_record_impacts(el);
-            cg->record_exits = BlackAbsorberData_get_record_exits(el);
-        }
+    // Jaw corners (with tilts)
+    cg->jaw_LU = BlackAbsorberData_get__jaw_LU(el);
+    cg->jaw_RU = BlackAbsorberData_get__jaw_RU(el);
+    // Get angles of jaws
+    cg->sin_zL = BlackAbsorberData_get__sin_zL(el);
+    cg->cos_zL = BlackAbsorberData_get__cos_zL(el);
+    cg->sin_zR = BlackAbsorberData_get__sin_zR(el);
+    cg->cos_zR = BlackAbsorberData_get__cos_zR(el);
+    cg->sin_zDiff = BlackAbsorberData_get__sin_zDiff(el);
+    cg->cos_zDiff = BlackAbsorberData_get__cos_zDiff(el);
+    cg->jaws_parallel = BlackAbsorberData_get__jaws_parallel(el);
+    // Tilts
+    cg->sin_yL = BlackAbsorberData_get__sin_yL(el);
+    cg->cos_yL = BlackAbsorberData_get__cos_yL(el);
+    cg->sin_yR = BlackAbsorberData_get__sin_yR(el);
+    cg->cos_yR = BlackAbsorberData_get__cos_yR(el);
+    // Length and segments
+    cg->length = BlackAbsorberData_get_length(el);
+    cg->side   = BlackAbsorberData_get__side(el);
+    double s_U, s_D, x_D;
+    if (cg->side != -1){
+        s_U = cg->length/2 * (1-cg->cos_yL);
+        s_D = cg->length/2 * (1+cg->cos_yL);
+        x_D = BlackAbsorberData_get__jaw_LD(el);
+        cg->segments_L = create_jaw(s_U, cg->jaw_LU, s_D, x_D, cg->sin_yL/cg->cos_yL, 1);
+    }
+    if (cg->side != 1){
+        s_U = cg->length/2 * (1-cg->cos_yR);
+        s_D = cg->length/2 * (1+cg->cos_yR);
+        x_D = BlackAbsorberData_get__jaw_RD(el);
+        cg->segments_R = create_jaw(s_U, cg->jaw_RU, s_D, x_D, cg->sin_yR/cg->cos_yR, -1);
+    }
+    // Impact table
+    cg->record = BlackAbsorberData_getp_internal_record(el, part0);
+    cg->record_index = NULL;
+    cg->record_impacts = 0;
+    cg->record_exits = 0;
+    if (cg->record){
+        cg->record_index = InteractionRecordData_getp__index(cg->record);
+        cg->record_impacts = BlackAbsorberData_get_record_impacts(el);
+        cg->record_exits = BlackAbsorberData_get_record_exits(el);
     }
-
     return cg;
 }
 
 /*gpufun*/
-void BlackAbsorber_free(CollimatorGeometry restrict cg, int8_t active){
-    if (active){
-        if (cg->side != -1){
-            destroy_jaw(cg->segments_L);
-        }
-        if (cg->side != 1){
-            destroy_jaw(cg->segments_R);
-        }
+void BlackAbsorber_free(CollimatorGeometry restrict cg){
+    if (cg->side != -1){
+        destroy_jaw(cg->segments_L);
+    }
+    if (cg->side != 1){
+        destroy_jaw(cg->segments_R);
     }
     free(cg);
 }
@@ -90,15 +85,17 @@ void BlackAbsorber_free(CollimatorGeometry restrict cg, int8_t active){
 
 /*gpufun*/
 void BlackAbsorber_track_local_particle(BlackAbsorberData el, LocalParticle* part0){
-
-    // Collimator active and length
     int8_t active = BlackAbsorberData_get_active(el);
     active       *= BlackAbsorberData_get__tracking(el);
     double const length = BlackAbsorberData_get_length(el);
 
     // Get geometry
-    CollimatorGeometry cg     = BlackAbsorber_init_geometry(el, part0, active);
-    int8_t record_scatterings = BlackAbsorberData_get_record_scatterings(el);
+    CollimatorGeometry cg;
+    int8_t record_scatterings;
+    if (active){
+        cg = BlackAbsorber_init_geometry(el, part0);
+        record_scatterings = BlackAbsorberData_get_record_scatterings(el);
+    }
 
     //start_per_particle_block (part0->part)
         if (!active){
@@ -130,7 +127,9 @@ void BlackAbsorber_track_local_particle(BlackAbsorberData el, LocalParticle* par
             }
         }
     //end_per_particle_block
-    BlackAbsorber_free(cg, active);
+    if (active){
+        BlackAbsorber_free(cg);
+    }
 }
 
 #endif /* XCOLL_ABSORBER_H */

xcoll/beam_elements/elements_src/black_crystal.h

@@ -24,73 +24,70 @@ int8_t BlackCrystalData_get_record_scatterings(BlackCrystalData el){
 
 
 /*gpufun*/
-CrystalGeometry BlackCrystal_init_geometry(BlackCrystalData el, LocalParticle* part0, int8_t active){
+CrystalGeometry BlackCrystal_init_geometry(BlackCrystalData el, LocalParticle* part0){
     CrystalGeometry cg = (CrystalGeometry) malloc(sizeof(CrystalGeometry_));
-    if (active){ // This is needed in order to avoid that the initialisation is called during a twiss!
-        cg->length = BlackCrystalData_get_length(el);
-        cg->side   = BlackCrystalData_get__side(el);
-        cg->bending_radius = BlackCrystalData_get__bending_radius(el);
-        cg->bending_angle  = BlackCrystalData_get__bending_angle(el);
-        cg->width  = BlackCrystalData_get_width(el);
-        cg->height = BlackCrystalData_get_height(el);
-        cg->jaw_U  = BlackCrystalData_get__jaw_U(el);
-        cg->sin_z  = BlackCrystalData_get__sin_z(el);
-        cg->cos_z  = BlackCrystalData_get__cos_z(el);
-        cg->sin_y  = BlackCrystalData_get__sin_y(el);
-        cg->cos_y  = BlackCrystalData_get__cos_y(el);
-        double jaw;
-        if (cg->side == 1){
-            jaw = cg->jaw_U;
-        } else if (cg->side == -1){
-            jaw = cg->jaw_U - cg->width;   // To ensure that jaw_U is the inner corner
-        } else {
-            kill_all_particles(part0, XC_ERR_INVALID_XOFIELD);
-            return cg;
-        }
-        cg->segments = create_crystal(cg->bending_radius, cg->width, cg->length, jaw, cg->sin_y, cg->cos_y);
-        // Impact table
-        cg->record = BlackCrystalData_getp_internal_record(el, part0);
-        cg->record_index = NULL;
-        cg->record_impacts = 0;
-        cg->record_exits = 0;
-        if (cg->record){
-            cg->record_index = InteractionRecordData_getp__index(cg->record);
-            cg->record_impacts = BlackCrystalData_get_record_impacts(el);
-            cg->record_exits = BlackCrystalData_get_record_exits(el);
-        }
-        // Not needed, set to zero
-        cg->miscut_angle = 0;
-        cg->s_P = 0;
-        cg->x_P = 0;
-        cg->t_VImax = 0;
+    cg->length = BlackCrystalData_get_length(el);
+    cg->side   = BlackCrystalData_get__side(el);
+    cg->bending_radius = BlackCrystalData_get__bending_radius(el);
+    cg->bending_angle  = BlackCrystalData_get__bending_angle(el);
+    cg->width  = BlackCrystalData_get__width(el);
+    cg->height = BlackCrystalData_get__height(el);
+    cg->jaw_U  = BlackCrystalData_get__jaw_U(el);
+    cg->sin_z  = BlackCrystalData_get__sin_z(el);
+    cg->cos_z  = BlackCrystalData_get__cos_z(el);
+    cg->sin_y  = BlackCrystalData_get__sin_y(el);
+    cg->cos_y  = BlackCrystalData_get__cos_y(el);
+    double jaw;
+    if (cg->side == 1){
+        jaw = cg->jaw_U;
+    } else if (cg->side == -1){
+        jaw = cg->jaw_U - cg->width;   // To ensure that jaw_U is the inner corner
+    } else {
+        kill_all_particles(part0, XC_ERR_INVALID_XOFIELD);
+        return cg;
     }
-
+    cg->segments = create_crystal(cg->bending_radius, cg->width, cg->length, jaw, cg->sin_y, cg->cos_y);
+    // Impact table
+    cg->record = BlackCrystalData_getp_internal_record(el, part0);
+    cg->record_index = NULL;
+    cg->record_impacts = 0;
+    cg->record_exits = 0;
+    if (cg->record){
+        cg->record_index = InteractionRecordData_getp__index(cg->record);
+        cg->record_impacts = BlackCrystalData_get_record_impacts(el);
+        cg->record_exits = BlackCrystalData_get_record_exits(el);
+    }
+    // Not needed, set to zero
+    cg->miscut_angle = 0;
+    cg->s_P = 0;
+    cg->x_P = 0;
+    cg->t_VImax = 0;
     return cg;
 }
 
 /*gpufun*/
-void BlackCrystal_free(CrystalGeometry restrict cg, int8_t active){
-    if (active){
-        destroy_crystal(cg->segments);
-    }
+void BlackCrystal_free(CrystalGeometry restrict cg){
+    destroy_crystal(cg->segments);
     free(cg);
 }
 
 
 /*gpufun*/
 void BlackCrystal_track_local_particle(BlackCrystalData el, LocalParticle* part0){
-
-    // Collimator active and length
     int8_t active = BlackCrystalData_get_active(el);
     active       *= BlackCrystalData_get__tracking(el);
     double const length = BlackCrystalData_get_length(el);
 
     // Get geometry
-    CrystalGeometry cg        = BlackCrystal_init_geometry(el, part0, active);
-    int8_t record_scatterings = BlackCrystalData_get_record_scatterings(el);
+    CrystalGeometry cg;
+    int8_t record_scatterings;
+    if (active){
+        cg = BlackCrystal_init_geometry(el, part0);
+        record_scatterings = BlackCrystalData_get_record_scatterings(el);
 
-    if (cg->width==0 || cg->height==0 || cg->bending_radius==0){
-        kill_all_particles(part0, XC_ERR_INVALID_XOFIELD);
+        if (cg->width==0 || cg->height==0 || cg->bending_radius==0){
+            kill_all_particles(part0, XC_ERR_INVALID_XOFIELD);
+        }
     }
 
     //start_per_particle_block (part0->part)
@@ -123,7 +120,9 @@ void BlackCrystal_track_local_particle(BlackCrystalData el, LocalParticle* part0
             }
         }
     //end_per_particle_block
-    BlackCrystal_free(cg, active);
+    if (active){
+        BlackCrystal_free(cg);
+    }
 }
 
 #endif /* XCOLL_ABSORBER_CRY_H */

xcoll/beam_elements/elements_src/everest_block.h

@@ -101,28 +101,38 @@ void EverestBlock_track_local_particle(EverestBlockData el, LocalParticle* part0
                 LocalParticle_set_s(part, 0);
 
                 // Store initial coordinates for updating later
-                double const rvv_in     = LocalParticle_get_rvv(part);
+                double const rvv_in  = LocalParticle_get_rvv(part);
 #ifdef XCOLL_USE_EXACT
-                double const xp_in      = LocalParticle_get_exact_xp(part);
-                double const yp_in      = LocalParticle_get_exact_yp(part);
+                double const xp_in   = LocalParticle_get_exact_xp(part);
+                double const yp_in   = LocalParticle_get_exact_yp(part);
 #else
-                double const xp_in      = LocalParticle_get_xp(part);
-                double const yp_in      = LocalParticle_get_yp(part);
+                double const xp_in   = LocalParticle_get_xp(part);
+                double const yp_in   = LocalParticle_get_yp(part);
 #endif
-                double const zeta_in    = LocalParticle_get_zeta(part);
-                double const energy_in  = LocalParticle_get_energy(part);
-                double energy_out;
+                double const zeta_in = LocalParticle_get_zeta(part);
+                double const p0c     = LocalParticle_get_p0c(part);
+                double const delta   = LocalParticle_get_delta(part);
+                double const qq0     = LocalParticle_get_charge_ratio(part);
+                double const chi     = LocalParticle_get_chi(part);
+                double const pc_in   = (1 + delta)*p0c*qq0/chi;
+                double pc_out;
 
                 EverestData everest = EverestBlock_init_data(part, coll);
-                energy_out = jaw(everest, part, energy_in, length, 0);
+                pc_out = jaw(everest, part, pc_in, length, 0);
                 free(everest);
                 LocalParticle_add_to_s(part, s_block);
 
                 LocalParticle_set_zeta(part, zeta_in);
+
                 // Survived particles need correcting:
                 if (LocalParticle_get_state(part)>0){
-                    // Update energy; the last flag keeps angles constant (even valid for exact angles!)
-                    LocalParticle_add_to_energy(part, energy_out - energy_in, 0);
+                    double const rpp_old  = LocalParticle_get_rpp(part);
+                    LocalParticle_update_delta(part, pc_out*chi/p0c/qq0 - 1);
+                    // Keep angles constant (this is also correct for exact angles): px_new = px_old*(1 + δ_new)/(1 + δ_old)
+                    double const scale = rpp_old / LocalParticle_get_rpp(part);
+                    LocalParticle_scale_px(part, scale);
+                    LocalParticle_scale_py(part, scale);
+
                     // Update zeta
 #ifdef XCOLL_USE_EXACT
                     double xp  = LocalParticle_get_exact_xp(part);

xcoll/beam_elements/elements_src/everest_collimator.h

@@ -32,65 +32,60 @@ void EverestCollimator_set_material(EverestCollimatorData el){
 
 
 /*gpufun*/
-CollimatorGeometry EverestCollimator_init_geometry(EverestCollimatorData el, LocalParticle* part0, int8_t active){
+CollimatorGeometry EverestCollimator_init_geometry(EverestCollimatorData el, LocalParticle* part0){
     CollimatorGeometry cg = (CollimatorGeometry) malloc(sizeof(CollimatorGeometry_));
-    if (active){ // This is needed in order to avoid that the initialisation is called during a twiss!
-        // Jaw corners (with tilts)
-        cg->jaw_LU = EverestCollimatorData_get__jaw_LU(el);
-        cg->jaw_RU = EverestCollimatorData_get__jaw_RU(el);
-        // Get angles of jaws
-        cg->sin_zL = EverestCollimatorData_get__sin_zL(el);
-        cg->cos_zL = EverestCollimatorData_get__cos_zL(el);
-        cg->sin_zR = EverestCollimatorData_get__sin_zR(el);
-        cg->cos_zR = EverestCollimatorData_get__cos_zR(el);
-        cg->sin_zDiff = EverestCollimatorData_get__sin_zDiff(el);
-        cg->cos_zDiff = EverestCollimatorData_get__cos_zDiff(el);
-        cg->jaws_parallel = EverestCollimatorData_get__jaws_parallel(el);
-        // Tilts
-        cg->sin_yL = EverestCollimatorData_get__sin_yL(el);
-        cg->cos_yL = EverestCollimatorData_get__cos_yL(el);
-        cg->sin_yR = EverestCollimatorData_get__sin_yR(el);
-        cg->cos_yR = EverestCollimatorData_get__cos_yR(el);
-        // Length and segments
-        cg->length = EverestCollimatorData_get_length(el);
-        cg->side   = EverestCollimatorData_get__side(el);
-        double s_U, s_D, x_D;
-        if (cg->side != -1){
-            s_U = cg->length/2 * (1-cg->cos_yL);
-            s_D = cg->length/2 * (1+cg->cos_yL);
-            x_D = EverestCollimatorData_get__jaw_LD(el);
-            cg->segments_L = create_jaw(s_U, cg->jaw_LU, s_D, x_D, cg->sin_yL/cg->cos_yL, 1);
-        }
-        if (cg->side != 1){
-            s_U = cg->length/2 * (1-cg->cos_yR);
-            s_D = cg->length/2 * (1+cg->cos_yR);
-            x_D = EverestCollimatorData_get__jaw_RD(el);
-            cg->segments_R = create_jaw(s_U, cg->jaw_RU, s_D, x_D, cg->sin_yR/cg->cos_yR, -1);
-        }
-        // Impact table
-        cg->record = EverestCollimatorData_getp_internal_record(el, part0);
-        cg->record_index = NULL;
-        cg->record_impacts = 0;
-        cg->record_exits = 0;
-        if (cg->record){
-            cg->record_index = InteractionRecordData_getp__index(cg->record);
-            cg->record_impacts = EverestCollimatorData_get_record_impacts(el);
-            cg->record_exits = EverestCollimatorData_get_record_exits(el);
-        }
+    // Jaw corners (with tilts)
+    cg->jaw_LU = EverestCollimatorData_get__jaw_LU(el);
+    cg->jaw_RU = EverestCollimatorData_get__jaw_RU(el);
+    // Get angles of jaws
+    cg->sin_zL = EverestCollimatorData_get__sin_zL(el);
+    cg->cos_zL = EverestCollimatorData_get__cos_zL(el);
+    cg->sin_zR = EverestCollimatorData_get__sin_zR(el);
+    cg->cos_zR = EverestCollimatorData_get__cos_zR(el);
+    cg->sin_zDiff = EverestCollimatorData_get__sin_zDiff(el);
+    cg->cos_zDiff = EverestCollimatorData_get__cos_zDiff(el);
+    cg->jaws_parallel = EverestCollimatorData_get__jaws_parallel(el);
+    // Tilts
+    cg->sin_yL = EverestCollimatorData_get__sin_yL(el);
+    cg->cos_yL = EverestCollimatorData_get__cos_yL(el);
+    cg->sin_yR = EverestCollimatorData_get__sin_yR(el);
+    cg->cos_yR = EverestCollimatorData_get__cos_yR(el);
+    // Length and segments
+    cg->length = EverestCollimatorData_get_length(el);
+    cg->side   = EverestCollimatorData_get__side(el);
+    double s_U, s_D, x_D;
+    if (cg->side != -1){
+        s_U = cg->length/2 * (1-cg->cos_yL);
+        s_D = cg->length/2 * (1+cg->cos_yL);
+        x_D = EverestCollimatorData_get__jaw_LD(el);
+        cg->segments_L = create_jaw(s_U, cg->jaw_LU, s_D, x_D, cg->sin_yL/cg->cos_yL, 1);
+    }
+    if (cg->side != 1){
+        s_U = cg->length/2 * (1-cg->cos_yR);
+        s_D = cg->length/2 * (1+cg->cos_yR);
+        x_D = EverestCollimatorData_get__jaw_RD(el);
+        cg->segments_R = create_jaw(s_U, cg->jaw_RU, s_D, x_D, cg->sin_yR/cg->cos_yR, -1);
+    }
+    // Impact table
+    cg->record = EverestCollimatorData_getp_internal_record(el, part0);
+    cg->record_index = NULL;
+    cg->record_impacts = 0;
+    cg->record_exits = 0;
+    if (cg->record){
+        cg->record_index = InteractionRecordData_getp__index(cg->record);
+        cg->record_impacts = EverestCollimatorData_get_record_impacts(el);
+        cg->record_exits = EverestCollimatorData_get_record_exits(el);
     }
-
     return cg;
 }
 
 /*gpufun*/
-void EverestCollimator_free(CollimatorGeometry restrict cg, int8_t active){
-    if (active){
-        if (cg->side != -1){
-            destroy_jaw(cg->segments_L);
-        }
-        if (cg->side != 1){
-            destroy_jaw(cg->segments_R);
-        }
+void EverestCollimator_free(CollimatorGeometry restrict cg){
+    if (cg->side != -1){
+        destroy_jaw(cg->segments_L);
+    }
+    if (cg->side != 1){
+        destroy_jaw(cg->segments_R);
     }
     free(cg);
 }
@@ -100,30 +95,28 @@ void EverestCollimator_free(CollimatorGeometry restrict cg, int8_t active){
 // run this function at creation of the collimator instead of every turn
 // Hmmmm this should be called whenever we change an xofield
 /*gpufun*/
-EverestCollData EverestCollimator_init(EverestCollimatorData el, LocalParticle* part0, int8_t active){
+EverestCollData EverestCollimator_init(EverestCollimatorData el, LocalParticle* part0){
     EverestCollData coll = (EverestCollData) malloc(sizeof(EverestCollData_));
-    if (active){ // This is needed in order to avoid that the initialisation is called during a twiss!
-        // Random generator and material
-        coll->rng = EverestCollimatorData_getp_rutherford_rng(el);
-        MaterialData material = EverestCollimatorData_getp__material(el);
-        coll->exenergy = MaterialData_get_excitation_energy(material)*1.0e3; // MeV
-        coll->rho      = MaterialData_get_density(material);
-        coll->anuc     = MaterialData_get_A(material);
-        coll->zatom    = MaterialData_get_Z(material);
-        coll->bnref    = MaterialData_get_nuclear_elastic_slope(material);
-        coll->radl     = MaterialData_get_radiation_length(material);
-        coll->csref[0] = MaterialData_get_cross_section(material, 0);
-        coll->csref[1] = MaterialData_get_cross_section(material, 1);
-        coll->csref[5] = MaterialData_get_cross_section(material, 5);
-        coll->only_mcs = MaterialData_get__only_mcs(material);
-        // Impact table:  need it here to record interactions
-        coll->record = EverestCollimatorData_getp_internal_record(el, part0);
-        coll->record_index = NULL;
-        coll->record_scatterings = 0;
-        if (coll->record){
-            coll->record_index = InteractionRecordData_getp__index(coll->record);
-            coll->record_scatterings = EverestCollimatorData_get_record_scatterings(el);
-        }
+    // Random generator and material
+    coll->rng = EverestCollimatorData_getp_rutherford_rng(el);
+    MaterialData material = EverestCollimatorData_getp__material(el);
+    coll->exenergy = MaterialData_get_excitation_energy(material)*1.0e3; // MeV
+    coll->rho      = MaterialData_get_density(material);
+    coll->anuc     = MaterialData_get_A(material);
+    coll->zatom    = MaterialData_get_Z(material);
+    coll->bnref    = MaterialData_get_nuclear_elastic_slope(material);
+    coll->radl     = MaterialData_get_radiation_length(material);
+    coll->csref[0] = MaterialData_get_cross_section(material, 0);
+    coll->csref[1] = MaterialData_get_cross_section(material, 1);
+    coll->csref[5] = MaterialData_get_cross_section(material, 5);
+    coll->only_mcs = MaterialData_get__only_mcs(material);
+    // Impact table:  need it here to record interactions
+    coll->record = EverestCollimatorData_getp_internal_record(el, part0);
+    coll->record_index = NULL;
+    coll->record_scatterings = 0;
+    if (coll->record){
+        coll->record_index = InteractionRecordData_getp__index(coll->record);
+        coll->record_scatterings = EverestCollimatorData_get_record_scatterings(el);
     }
     return coll;
 }
@@ -150,8 +143,12 @@ void EverestCollimator_track_local_particle(EverestCollimatorData el, LocalParti
 
     // Initialise collimator data
     // TODO: we want this to happen before tracking (instead of every turn), as a separate kernel
-    EverestCollData coll  = EverestCollimator_init(el, part0, active);
-    CollimatorGeometry cg = EverestCollimator_init_geometry(el, part0, active);
+    EverestCollData coll;
+    CollimatorGeometry cg;
+    if (active){
+        coll = EverestCollimator_init(el, part0);
+        cg = EverestCollimator_init_geometry(el, part0);
+    }
 
     //start_per_particle_block (part0->part)
         if (!active){
@@ -168,17 +165,21 @@ void EverestCollimator_track_local_particle(EverestCollimatorData el, LocalParti
                 LocalParticle_set_s(part, 0);
 
                 // Store initial coordinates for updating later
-                double const rvv_in     = LocalParticle_get_rvv(part);
+                double const rvv_in  = LocalParticle_get_rvv(part);
 #ifdef XCOLL_USE_EXACT
-                double const xp_in      = LocalParticle_get_exact_xp(part);
-                double const yp_in      = LocalParticle_get_exact_yp(part);
+                double const xp_in   = LocalParticle_get_exact_xp(part);
+                double const yp_in   = LocalParticle_get_exact_yp(part);
 #else
-                double const xp_in      = LocalParticle_get_xp(part);
-                double const yp_in      = LocalParticle_get_yp(part);
+                double const xp_in   = LocalParticle_get_xp(part);
+                double const yp_in   = LocalParticle_get_yp(part);
 #endif
-                double const zeta_in    = LocalParticle_get_zeta(part);
-                double const energy_in  = LocalParticle_get_energy(part);
-                double energy_out;
+                double const zeta_in = LocalParticle_get_zeta(part);
+                double const p0c     = LocalParticle_get_p0c(part);
+                double const delta   = LocalParticle_get_delta(part);
+                double const qq0     = LocalParticle_get_charge_ratio(part);
+                double const chi     = LocalParticle_get_chi(part);
+                double const pc_in   = (1 + delta)*p0c*qq0/chi;
+                double pc_out;
 
                 // Check if hit on jaws
                 int8_t is_hit = hit_jaws_check_and_transform(part, cg);
@@ -188,7 +189,7 @@ void EverestCollimator_track_local_particle(EverestCollimatorData el, LocalParti
                     double remaining_length = length - LocalParticle_get_s(part);
                     // Scatter
                     EverestData everest = EverestCollimator_init_data(part, coll);
-                    energy_out = jaw(everest, part, energy_in, remaining_length, 1);
+                    pc_out = jaw(everest, part, pc_in, remaining_length, 1);
                     free(everest);
                 }
 
@@ -197,10 +198,16 @@ void EverestCollimator_track_local_particle(EverestCollimatorData el, LocalParti
                 LocalParticle_add_to_s(part, s_coll);
 
                 LocalParticle_set_zeta(part, zeta_in);
+
                 // Hit and survived particles need correcting:
                 if (is_hit!=0 && LocalParticle_get_state(part)>0){
-                    // Update energy; the last flag keeps angles constant (even valid for exact angles!)
-                    LocalParticle_add_to_energy(part, energy_out - energy_in, 0);
+                    double const rpp_old  = LocalParticle_get_rpp(part);
+                    LocalParticle_update_delta(part, pc_out*chi/p0c/qq0 - 1);
+                    // Keep angles constant (this is also correct for exact angles): px_new = px_old*(1 + δ_new)/(1 + δ_old)
+                    double const scale = rpp_old / LocalParticle_get_rpp(part);
+                    LocalParticle_scale_px(part, scale);
+                    LocalParticle_scale_py(part, scale);
+
                     // Update zeta
 #ifdef XCOLL_USE_EXACT
                     double xp  = LocalParticle_get_exact_xp(part);
@@ -218,8 +225,10 @@ void EverestCollimator_track_local_particle(EverestCollimatorData el, LocalParti
             }
         }
     //end_per_particle_block
-    EverestCollimator_free(cg, active);
-    free(coll);
+    if (active){
+        EverestCollimator_free(cg);
+        free(coll);
+    }
 }