![(please configure the [header_logo] section in trac.ini)](/TRACY3/chrome/site/your_project_logo.png){kind=logo}
Changeset 9 in TRACY3
- Timestamp:
- Jan 10, 2013, 3:05:06 PM (11 years ago)
- Location:
- trunk/tracy
- Files:
-
- 7 edited
-
.kdev4/tracy.kdev4 (modified) (2 diffs)
-
autom4te.cache/requests (modified) (2 diffs)
-
tools/soltracy.cc (modified) (2 diffs)
-
tracy/doc/runme (modified) (1 diff)
-
tracy/src/field.cc (modified) (1 diff)
-
tracy/src/soleilcommon.cc (modified) (1 diff)
-
tracy/src/t2elem.cc (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/tracy/.kdev4/tracy.kdev4
r3 r9 12 12 13 13 [Launch][Launch Configuration 0][Data] 14 Arguments= tracy.prm14 Arguments=fmap.prm 15 15 Dependencies=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x00) 16 16 Dependency Action=Nothing 17 17 EnvironmentGroup=default 18 Executable=file:///home/jfz/codes/tracyIII_3_10/tr acy/tools/soltracy18 Executable=file:///home/jfz/codes/tracyIII_3_10/trunk/tracy/tools/soltracy 19 19 External Terminal=konsole --noclose --workdir %workdir -e %exe 20 20 Project Target= 21 21 Use External Terminal=false 22 Working Directory=file:///home/jfz/work_in_france/lal/ superB/DR22 Working Directory=file:///home/jfz/work_in_france/lal/thom-x/alex/fmap 23 23 isExecutable=true 24 24 … … 26 26 Default Make Environment Profile=0 27 27 Number Of Jobs=1 28 29 [Project] 30 VersionControlSupport=kdevsubversion -
trunk/tracy/autom4te.cache/requests
r3 r9 70 70 'AM_PROG_CC_C_O' => 1, 71 71 '_AM_MANGLE_OPTION' => 1, 72 'AM_SET_LEADING_DOT' => 1, 72 73 'AM_CONDITIONAL' => 1, 73 'AM_SET_LEADING_DOT' => 1,74 74 'AM_SET_DEPDIR' => 1, 75 75 '_AM_DEPENDENCIES' => 1, 76 'm4_include' => 1, 76 77 'AM_PROG_INSTALL_SH' => 1, 77 'm4_include' => 1,78 78 '_AC_AM_CONFIG_HEADER_HOOK' => 1, 79 79 'AU_DEFUN' => 1, … … 93 93 ], 94 94 { 95 '_LT_AC_TAGCONFIG' => 1, 95 96 'AM_PROG_F77_C_O' => 1, 96 ' _LT_AC_TAGCONFIG' => 1,97 'AC_INIT' => 1, 97 98 'm4_pattern_forbid' => 1, 98 'AC_ INIT' => 1,99 'AC_CANONICAL_TARGET' => 1, 99 100 '_AM_COND_IF' => 1, 100 'AC_C ANONICAL_TARGET' => 1,101 'AC_CONFIG_LIBOBJ_DIR' => 1, 101 102 'AC_SUBST' => 1, 102 'AC_C ONFIG_LIBOBJ_DIR' => 1,103 'AC_CANONICAL_HOST' => 1, 103 104 'AC_FC_SRCEXT' => 1, 104 'AC_CANONICAL_HOST' => 1,105 105 'AC_PROG_LIBTOOL' => 1, 106 106 'AM_INIT_AUTOMAKE' => 1, 107 'AC_CONFIG_SUBDIRS' => 1, 107 108 'AM_PATH_GUILE' => 1, 108 'AC_CONFIG_SUBDIRS' => 1,109 109 'AM_AUTOMAKE_VERSION' => 1, 110 110 'LT_CONFIG_LTDL_DIR' => 1, 111 'AC_REQUIRE_AUX_FILE' => 1, 111 112 'AC_CONFIG_LINKS' => 1, 112 ' AC_REQUIRE_AUX_FILE' => 1,113 'LT_SUPPORTED_TAG' => 1, 113 114 'm4_sinclude' => 1, 114 'LT_SUPPORTED_TAG' => 1,115 115 'AM_MAINTAINER_MODE' => 1, 116 116 'AM_NLS' => 1, 117 117 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, 118 '_m4_warn' => 1, 118 119 'AM_MAKEFILE_INCLUDE' => 1, 119 '_m4_warn' => 1,120 120 'AM_PROG_CXX_C_O' => 1, 121 '_AM_COND_ENDIF' => 1, 121 122 '_AM_MAKEFILE_INCLUDE' => 1, 122 '_AM_COND_ENDIF' => 1,123 123 'AM_ENABLE_MULTILIB' => 1, 124 124 'AM_PROG_MOC' => 1, 125 125 'AM_SILENT_RULES' => 1, 126 126 'AC_CONFIG_FILES' => 1, 127 'include' => 1, 127 128 'LT_INIT' => 1, 128 ' include' => 1,129 'AM_PROG_AR' => 1, 129 130 'AM_GNU_GETTEXT' => 1, 130 'AM_PROG_AR' => 1,131 131 'AC_LIBSOURCE' => 1, 132 'AC_CANONICAL_BUILD' => 1, 132 133 'AM_PROG_FC_C_O' => 1, 133 'AC_CANONICAL_BUILD' => 1,134 134 'AC_FC_FREEFORM' => 1, 135 135 'AH_OUTPUT' => 1, 136 '_AM_SUBST_NOTMAKE' => 1, 136 137 'AC_CONFIG_AUX_DIR' => 1, 137 '_AM_SUBST_NOTMAKE' => 1, 138 'AM_PROG_CC_C_O' => 1, 139 'sinclude' => 1, 138 140 'm4_pattern_allow' => 1, 139 ' sinclude' => 1,140 'A M_PROG_CC_C_O' => 1,141 'AM_CONDITIONAL' => 1, 142 'AC_CANONICAL_SYSTEM' => 1, 141 143 'AM_XGETTEXT_OPTION' => 1, 142 'AC_CANONICAL_SYSTEM' => 1,143 'AM_CONDITIONAL' => 1,144 144 'AC_CONFIG_HEADERS' => 1, 145 145 'AC_DEFINE_TRACE_LITERAL' => 1, -
trunk/tracy/tools/soltracy.cc
r8 r9 1 /* 1 /************************************ 2 2 Current revision $Revision$ 3 3 On branch $Name$ 4 4 Latest change $Date$ by $Author$ 5 * /5 *************************************/ 6 6 #define ORDER 1 7 7 … … 40 40 // turn on globval.Cavity_on and globval.radiation to get proper synchro radiation damping 41 41 // IDs accounted too if: wiggler model and symplectic integrator (method = 1) 42 globval.H_exact = true;42 globval.H_exact = false; 43 43 44 44 /* parameters to read the user input script .prm */ -
trunk/tracy/tracy/doc/runme
r3 r9 7 7 dvipdf $File.dvi 8 8 9 rm *.dvi *aux *.log 9 rm *.dvi *aux *.log *.out *.toc 10 10 11 11 evince $File.pdf & -
trunk/tracy/tracy/src/field.cc
r3 r9 1 /* Author: Johan Bengtsson 1 /******************************************************** 2 Author: Johan Bengtsson 2 3 3 Definitions: Polymorphic number class. */ 4 Definitions: Polymorphic number class. 5 ********************************************************/ 4 6 5 7 template<> -
trunk/tracy/tracy/src/soleilcommon.cc
r3 r9 159 159 160 160 /* Defines global variables for Tracy code */ 161 globval.H_exact = true; // Small Ring Hamiltonian161 globval.H_exact = false; // Small Ring Hamiltonian 162 162 globval.quad_fringe = false; // quadrupole fringe fields on/off 163 163 globval.EPU = false; // Elliptically Polarizing Undulator -
trunk/tracy/tracy/src/t2elem.cc
r3 r9 660 660 661 661 (exact form of the H of the drift) 662 A(x,y,-l,px,py,dP) = -sqrt( (1 + delta)^2 + px^2 +py^2 ) + delta662 A(x,y,-l,px,py,dP) = -sqrt( (1 + delta)^2 - px^2 - py^2 ) + delta 663 663 664 664 (exact form of the H of the kick from the magnet) 665 B(x,y,-l,px,py,dP) = -h*x*sqrt( (1 + delta)^2 + px^2 +py^2 ) + h x + h^2*x^2/2 + int(Re(By+iBx)/Brho)665 B(x,y,-l,px,py,dP) = -h*x*sqrt( (1 + delta)^2 - px^2 - py^2 ) + h x + h^2*x^2/2 + int(Re(By+iBx)/Brho) 666 666 667 667 so this is the exact Hamitonian for small ring. … … 670 670 The kick is given by 671 671 e 672 Dp_x = L* (h_ref*sqrt( (1 + delta)^2 + px^2 + py^2 ) - h_bend - x^2*h_bend*h_ref/2 ----- B_y )672 Dp_x = L* (h_ref*sqrt( (1 + delta)^2 - (px^2 + py^2) ) - h_bend - x*h_bend*h_ref - ---- B_y ) 673 673 p_0 674 674 Dp_y = L* e/p_0 * B_x 675 675 676 x = L* h*x_ref / sqrt( (1 + delta)^2 + px^2 +py^2) * p_x676 x = L* h*x_ref / sqrt( (1 + delta)^2 - px^2 - py^2) * p_x 677 677 678 y = L* h*x_ref / sqrt( (1 + delta)^2 + px^2 +py^2) * p_y678 y = L* h*x_ref / sqrt( (1 + delta)^2 - px^2 - py^2) * p_y 679 679 680 CT = L* h*x_ref / sqrt( (1 + delta)^2 + px^2 +py^2) * (1+delta)680 CT = L* h*x_ref / sqrt( (1 + delta)^2 - px^2 - py^2) * (1+delta) 681 681 682 682 where … … 826 826 // x[ct_]+= (1+x0[delta_])*L*h_bend*h_ref + (1+x0[delta_])*h_ref*(asin(n1) - asin(n2)); 827 827 // 828 829 830 828 }//approximate Hamiltonian 829 else { 830 x[px_] -= L * (ByoBrho + (h_bend - h_ref) / 2.0 + h_ref * h_bend 831 831 * x0[x_] - h_ref * x0[delta_]); 832 x[ct_] += L * h_ref * x0[x_]; 833 834 // second order of the h_ref835 u = L * h_ref * x0[x_] /(1.0+x[delta_]);836 x[x_] += u * x0[px_];837 x[y_] += u * x0[py_];838 x[ct_] += u*(sqr(x0[px_])+sqr(x0[py_]))/(2.0*(1.0+x0[delta_]));832 x[ct_] += L * h_ref * x0[x_]; 833 834 // second order of the h_ref 835 u = L * h_ref * x0[x_] /(1.0+x[delta_]); 836 x[x_] += u * x0[px_]; 837 x[y_] += u * x0[py_]; 838 x[ct_] += u*(sqr(x0[px_])+sqr(x0[py_]))/(2.0*(1.0+x0[delta_])); 839 839 } 840 840 … … 922 922 if (true) { 923 923 924 //cout << "With Alex's correction: " << endl;924 //cout << "With Alex's correction: " << endl; 925 925 926 926 //with the contribution from the entrance angle of the particle at the edge … … 1308 1308 EdgeFocus(M->Pirho, M->PTx1, M->Pgap, x,true); 1309 1309 } else {//small and big rings 1310 1311 1312 1313 1310 if(M->PTx1!=0){ 1314 1311 EdgeFocus(M->Pirho, x); 1315 p_rot(M->PTx1, x);1312 //p_rot(M->PTx1, x); 1316 1313 //rotate from cartesian cooridnate to curlinear curved beam coordinate; 1317 1314 // since the map of a sector dipole is used in Tracy 3 1318 1315 } 1316 p_rot(M->PTx1, x); 1319 1317 bend_fringe(M->Pirho, M->Pgap, x); //fringe field 1320 1321 1322 1323 1318 } 1324 1319 } … … 1431 1426 1432 1427 bend_fringe(-M->Pirho, M->Pgap,x); //fringe field of the dipole 1428 p_rot(M->PTx2, x); 1433 1429 if(M->PTx2!=0){ 1434 p_rot(M->PTx2, x); //rotate back to the cartesian cooridinate1430 //p_rot(M->PTx2, x); //rotate back to the cartesian cooridinate 1435 1431 EdgeFocus(M->Pirho, x); 1436 1432 }
Note: See TracChangeset
for help on using the changeset viewer.
