Changeset 24 in TRACY3


Ignore:
Timestamp:
Dec 19, 2013, 2:13:02 PM (10 years ago)
Author:
zhangj
Message:

Clear useless data files and compiled generated files.

Location:
trunk
Files:
5 added
43 deleted
13 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/lattice

    • Property svn:ignore

      •  

        old new  
        1 .cvsignore
         1
         2

  • trunk/make_for_gcc.sh

    r3 r24  
    33set -x # for debugging
    44
     5#===================================================
     6# Compile non-parallel Tracy3 on the ubuntu 12.04
     7#
     8#
     9# Last updated by Jianfeng Zhang @LAL, 04/2012.
     10#===================================================
    511
    612

  • trunk/make_for_tracy3.sh

    r3 r24  
    33#===================================================
    44# script to compile non-parallel version tracy
     5#  and paralle version tracy at SOLEIL cluster
     6#
     7#
     8#  Last updated by L. Nadolski @SOLEIL, 12/2011.
    59#===================================================
    610

  • trunk/tracy

    • Property svn:ignore

      •  

        old new  
        1 .cvsignore
         1*.kdev4
         2.kdev4
         3config.h.in
         4configure.in
         5configure.ref
         6Makefile.in
         7
         8
         9
         10

  • trunk/tracy/TPSA

    • Property svn:ignore

      •  

        old new  
        1 .cvsignore
         1Makefile.in
         2
         3

  • trunk/tracy/tracy

    • Property svn:ignore

      •  

        old new  
        1 .cvsignore
         1Makefile.in

  • trunk/tracy/tracy/bin

    • Property svn:ignore

      •  

        old new  
        1 .cvsignore
         1soltracy

  • trunk/tracy/tracy/doc

    • Property svn:ignore

      •  

        old new  
        1 .cvsignore
         1runme

  • trunk/tracy/tracy/inc

    • Property svn:ignore

      •  

        old new  
        1 .cvsignore
         1*.dat
         2
         3

  • trunk/tracy/tracy/lib

    • Property svn:ignore

      •  

        old new  
        1 .cvsignore
         1

  • trunk/tracy/tracy/src

    • Property svn:ignore

      •  

        old new  
        1 .cvsignore
         1log
         2Makefile.in
         3*.out
         4*.dat
         5*.fft
         6

  • trunk/tracy/tracy/src/t2elem.cc

    r19 r24  
    10621062 close to the Forest's model and K. Brown's models.
    10631063 
     1064 07/2013  Jianfeng Zhang @ LAL
     1065 Fix the bug in x[py], change
     1066               x0[y]/ (1.0 + x0[delta_]*1) to x0[y_]/ (1.0 + x0[delta_]*0),
     1067 now the vertical chromaticity is not 0.5 as in ELEGANT.
     1068
    10641069 ****************************************************************************/
    10651070template<typename T>
    10661071static void EdgeFocus(double irho, double phi, double gap, ss_vect<T> &x, bool Entrance) {
    10671072 
     1073  ss_vect<T> x0;
     1074  x0 = x;
    10681075
    10691076    if (true) {
    … …  
    11041111    //add the contribution of the entrance momentum of the particle, from Alex Loulergue.
    11051112    if(Entrance){
    1106        x[px_] += irho * tan(dtor(phi) +x[py_]/(1+x[delta_]*1)) * x[x_]/ (1.0 + x[delta_]*0);
    1107        x[py_] -= irho * tan(dtor(phi) + x[px_]/(1+x[delta_]*1) - get_psi(irho, phi, gap)/(1+x[delta_]*0)) * x[y_]
    1108                 / (1.0 + x[delta_]*0);
     1113       x[px_] += irho * tan(dtor(phi) ) * x0[x_];
     1114       x[py_] -= irho * tan(dtor(phi) + x0[px_]/(1+x0[delta_]*1) - get_psi(irho, phi, gap)/(1+x0[delta_]*0)) * x0[y_]
     1115                / (1.0 + x0[delta_]*0);
    11091116    }else{
    1110        x[px_] += irho * tan(dtor(phi) - x[py_]/(1+x[delta_]*1)) * x[x_]/ (1.0 + x[delta_]*0);
    1111        x[py_] -= irho * tan(dtor(phi) - x[px_]/(1+x[delta_]*1) - get_psi(irho, phi, gap)/(1+x[delta_]*0)) * x[y_]
    1112                 / (1.0 + x[delta_]*0);
     1117       x[px_] += irho * tan(dtor(phi)) * x0[x_];
     1118       x[py_] -= irho * tan(dtor(phi) - x0[px_]/(1+x0[delta_]*1) - get_psi(irho, phi, gap)/(1+x0[delta_]*0)) * x0[y_]
     1119                / (1.0 + x0[delta_]*0);
    11131120    }
    11141121     
Note: See TracChangeset for help on using the changeset viewer.