DIST block for PySixDesk #49
Conversation
Update my own fork, before adding my changes
Merge Loic's changes made for my fork
|
Here an example of the particle initialization for both polar and cartesian grids. Amplitudes are set to be scanned from 5 to 15 sigma (incl.). At energy 450 GeV and assuming normalized emittance eps_norm = 3.5 um.rad this translates into: eps_geom = 7.3 nm. Given 2J = eps_geom, amplitudes (2J) should be extending from 36.5 nm to 109.5 nm, which is in agreement with output from the singletrackfile at turn 0 (distributions, and grey lines, plot below). For the polar grid, the number of angles was chosen to be 10 (excl. angles 0 deg and 90 deg). |
There was a problem hiding this comment.
Hi @michuschenk ,
many thanks for the PR. I have added some punctual comments, nothing major.
The only major point is the break of the backward compatibility. Am I right in saying that the breakage is due to the replacement of the TRAC/INIT blocks with the SIMU block? I am wondering if we should modify slightly your PR, and if we request the one turn jobs, we use the TRAC/INIT blocks, erroring in case the user requests a non-polar mesh, what do you think?
Cheers,
| } | ||
|
|
||
| self.madx = self.find_patterns(self.mask_path) | ||
| self.sixtrack = self.find_patterns(self.fort_path, | ||
| mandatory=['chrom_eps', 'CHROM']) | ||
| self.sixtrack['dist_type'] = 'None' |
There was a problem hiding this comment.
don't you want to use really None?
| @@ -117,6 +117,10 @@ def oneturn(self): | |||
| sixtrack['toggle_coll/'] = '/' | |||
| return sixtrack | |||
|
|
|||
| @staticmethod | |||
| def da_angles(start=0, end=pi/2, n=7): | |||
| return linspace(start, end, n + 2)[1: -1] # exclusive | |||
There was a problem hiding this comment.
I would add a more verbose comment, saying that we don't take 0 and pi/2
| z.update(y) | ||
| return z | ||
| def linspace(a, b, n): | ||
| '''Numpyless linear spacing function. |
There was a problem hiding this comment.
why do you want a numpyless function for this?
There was a problem hiding this comment.
I think this is my doing, the main reason was simply to not have to add numpy as a dependency solely for its linspace method.
| / Beam block is actually already in the fort.3.mad file | ||
| / BEAM | ||
| / %bunch_charge %emit_norm_x %emit_norm_y %sig_z %sig_e 1 %ibtype 1 0 | ||
| / NEXT |
There was a problem hiding this comment.
I would remove these lines, then
| %toggle_coll/LIMI | ||
| %toggle_coll// DEBUG | ||
| %toggle_coll// PREC 0.001 | ||
| %toggle_coll// PRIN ape_dump.dat | ||
| %toggle_coll/LOAD fort3.limi | ||
| %toggle_coll/NEXT |
| @@ -0,0 +1,643 @@ | |||
| ! Links definitions | |||
There was a problem hiding this comment.
I would add a (very short) description of which machine/configuration you are running with MADX
Includes following main changes