This commit was manufactured by cvs2svn to create tag 'ISEI_3_5_1-PATCH_2'.

6c43f51d · (no author) · eda4cf6c · eda4cf6c · eda4cf6c · eda4cf6c
Commit 6c43f51d authored 13 years ago by (no author)
--- a/rsync4isei.sh
+++ b/rsync4isei.sh
-#!/bin/sh
-
-# MAC HOME DIR. for Codes
-HOMEDIR=/Users/nadolski/Documents
-
-
-DIRNAME=codes/tracy/TracyIII/tracy/tracy/src
-rsync -avb $HOMEDIR/$DIRNAME/*.cc isei:$DIRNAME 
-
-DIRNAME=codes/tracy/TracyIII/tracy/tracy/inc
-rsync -avb $HOMEDIR/$DIRNAME/*.h isei:$DIRNAME 
-
-DIRNAME=codes/tracy/TracyIII/tracy/tools
-rsync -avb $HOMEDIR/$DIRNAME/*.cc isei:$DIRNAME 
-
--- a/tracy/tools/Input_test.prm
+++ b/tracy/tools/Input_test.prm
-#*******************************************************************
-# 28 septembre 2010
-# File for checking TRacy is running well
-#
-# input script to set the file and bool flag
-#
-#  comments:
-# 1) Blank line and line starting with "#" (comment) are ignored
-# 2) Obligatory parameter: lat_file,
-#     lat file name is without the extension of .lat
-# 3) All the other parameters are optional, and all the default 
-#      values for flags are false
-# 4) Default FMAP values are: 
-#      _FmapFlag_nxpoint=31L, _FmapFlag_nypoint=21L,
-#      _FmapFlag_nturn=516L; _FmapFlag_xmax=0.025, 
-#      _FmapFlag_ymax=0.005, _FmapFlag_delta=0.0;
-#      _FmapFlag_diffusion = true;
-# 5) Default values of FMAPdp are the same as FMAP.
-# 6) if ThinsextFlag is true, MultipoleFlag must be true
-# 7) if set ChamberNoU20Flag or ReadChamberFlag to be true, 
-#    ChamberFlag must be true
-#
-#  Test verison for the development of Tracy 3, always the nearest
-#        input file verison.
-#
-#                     10/2010    Jianfeng Zhang 
-#
-#******************************************************************
-#******files********
-# relative directory of the files in the script
-# in_dir /home/zhang/codes/TracyIII/lattice/   
- in_dir /Users/nadolski/codes/tracy/maille/soleil/
-
-# lattice file must be wihout .lat extension
-  lat_file  solamor2_reglage_focalisation_chcvqt_thicksextu_LQPintermediaire_QFF  
-#  lat_file  solamor2_reglage_focalisation_chcvqt_thicksextu_LQPintermediaire_QFF_FullQuad
-
-# vacuum chamber file
-  chamber_file Chamber_example.dat
-
-# multipole error file
-  multipole_file multipole_error.dat
-
-# files for looking for the multipole of corrector (Machine current based)
-  fic_hcorr corh.txt
-  fic_vcorr corv.txt
-  fic_skew  corqt.txt
-
-
-#*******boolean flag***********
-
-# VACCUUM CHAMBER PART
-# include vacuum chamber
-  ChamberFlag  true
-
-# read vacuum chamber from chamber_file, ChamberFlag must be true, if 
-# ReadChamberFlag is true
-  ReadChamberFlag  true
-
-# include vacuum chamber but no U20, ChamberFlag must be true, if 
-# ChamberNoU20Flag  is true
-  ChamberNoU20Flag  false
-
-
-# GLOBAL PARAMETER PART
-# Activate quadrupole Fringefield
-  globval.quad_fringe true
-
-
-# include RF Cavity or not and set 
-# 4D/6D tracking, true=6D, false=4D
-  globval.Cavity_on false
-
-# set RF voltage, if false, then use the definition value
-# of RF cavity in the lattice
-# name, flag, RF voltage [V]
- RFvoltageFlag false  3000000
-
-# tune obtained by tracking
-  TuneTracFlag    true
-# chromaticity obtained by tracking
-  ChromTracFlag   true
-
-# TUNESHIFT WITH AMPLITUDE
-
-# tune shift with amplitude and energy
-#    AmplitudeTuneShiftFlag flag Nbx Nby TurnNumber xmax(m) ymax(m) delta
-#    Nbx and Nby Number of amplitude values in H et V planes
-#    TurnNumber number of turns for tracking  
-#    xmax ymax maximum amplitude value (sqrt law)
-#    delta energy offset
- AmplitudeTuneShiftFlag  false 50 30 516 0.035 0.02 0.0
-
-# EnergyTuneShiftFlag flag Nb TurnNumber emax
-#    Nb point number
-#    TurnNumber number of turn for tracking  
-#    emax maximum energy for tracking
- EnergyTuneShiftFlag  false 31 1026 0.06 
-
-
-# FMA calculate frequency map 
-#    Nbx Nby number of point in h and v planes
-#    TurnNumber Number of turns for tracking
-#    xmax, ymax maximum amplitude
-#    energyoffset 
-#    diffusionflag to compute tunediffusion 
- FmapFlag false 31 21 516 0.025 0.005 0.0 true
-
-#  FMA dp calculate frequency map
-#     Nbx Nby number of point in h and v planes
-#     TurnNumber Number of turns for tracking
-#     xmax, ymax maximum amplitude
-#     energyoffset 
-#     diffusionflag to compute tunediffusion 
- FmapdpFlag false 101 121 1026 25e-3 0.06 0.3e-3 true
-
-# error coupling
-#    flag, random seed number, RMS value of the rotation angle 
-#    of the quadrupole
-  ErrorCouplingFlag false  0  0.0007
-# coupling flag
-#    calcualte the coupling factor in the lattice 
-  CouplingFlag  false
-
-# calculate momentum acceptance for Touscheck lifetime
-#   Dim  istart istop eminp emaxp nstepp eminn emaxn nstepn
-#   Dim: 4D/6D tracking, default value is 6D
-  MomentumAccFlag true 4D 1 209 0.01 0.05 100 -0.01 -0.05 100
-
-
-
-#### MULTIPOLE FACTORY
- # read multipole error from a file and set them to the lattice
- ReadMultipoleFlag true
-
-#******to be obsoleted************************
-# include multipole error into the lattice, the mutipole error
-#     of Horizontal and vertical correctors, and skew quadrupole
-#      is read from the files, the name of which are set at the 
-#       beginning of this script. 
- MultipoleFlag false
-# set multipole with thin or thick lens model,
-# MultipoleFlag must be true  if ThinsextFlag is true 
-  ThinsextFlag  false
-#**************************************************
-
-###
-### FITTING FACTORY
-###
-# fit tune
-# name, flag, tuned quadrople,tuned quadrople,targetnudx    targetnudz
-#  FitTuneFlag   true  q7 q9   18.202 10.317
-  FitTune4Flag  true  qp7a qp7b  qp9a qp9b  18.202 10.317
-
-# fit chromaticity
-# name,flag, tuned sextupole, tuned sextupole, targetksix    targetksiz
-  FitChromFlag  true sx9 sx10  2.0    2.6
-
-
-###
-### Touschek lifetime
-###
-# calculate Touschek lifetime
-# name, flag
-  TouschekFlag false
-# Intra Beam Scattering, TouschekFlag must be true 
-  IBSFlag  false
-# Track momentum acceptance and then get Touschek lifetime, TouschekFlag must be true 
-  TousTrackFlag false
-
-### OTHER
-# include girder error
-  GirderErrorFlag  false
-
-# plot beam size around the ring
-  SigmaFlag  false
-
-# specific for test
-  PX2Flag  false
-
-# calculate induced amplitude
-  InducedAmplitudeFlag  false
-
-# specific for test
-  CodeComparaisonFlag  false
-
-# calculate Eta function
-  EtaFlag  false
--- a/tracy/tools/Makefile.am
+++ b/tracy/tools/Makefile.am
-# Makefile for the Tracy/tools
-#
-# Current revision $Revision: 1.8 $
-# Latest change by $Author: nadolski $
-
-#SUBDIRS = ptc
-
-#bin_PROGRAMS      = max4 
-bin_PROGRAMS      = soltracy 
-#bin_PROGRAMS      = soltracy testtracy 
-#bin_PROGRAMS      = max4 track_fft dynap leac
-
-#max4_SOURCES      = max4.cc nrutil.c nrcheck.c nrlinwww.c   nrframe.c
-# Normal
-#soltracy3_SOURCES  = soltracy.cc nrutil.c nrcheck.c nrlinwww.c   nrframe.c
-# With no library
-soltracy_SOURCES  = soltracy.cc nrutil.c nrcheck.c nrlinwww.c nrframe.c ../tracy/src/tracy_lib.cc
-#testtracy_SOURCES = testtracy.cc nrutil.c nrcheck.c nrlinwww.c nrframe.c ../tracy/src/tracy_lib.cc
-
-# these work with tracy-3.5-20090922
-# HYPERION
-#LIBS     = -L$(TRACY_LIB)/tracy/lib -ltracy -L$(NUM_REC)/lib -lnum_rec \
-#	   -lstdc++ \
-#           -L/usr/lib/gcc/i386-redhat-linux/4.1.1 -lgfortran
-# Modif for Library directory in src instead of lib for easing the compilation
-# otherwise issue with compiling and installing the library, has to by done by hand.
-
-# MAC
-# with Library
-#LIBS     = -L$(TRACY_LIB)/tracy/src -ltracy -L$(NUM_REC)/lib -lrecipes_c_gcc \
-#	   -lstdc++ -L$(LIBPATH) -lgfortran
-LIBS     = -L$(NUM_REC)/lib -lrecipes_c_gcc \
-	   -lstdc++ -lgfortran
-INCLUDES = -I$(TRACY_LIB)/tracy/inc -I$(NUM_REC)/inc