From 26f4b74ecae4a8c9372f9c75f2d462d146730dc0 Mon Sep 17 00:00:00 2001
From: nadolski <nadolski@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Wed, 1 Dec 2010 15:57:52 +0000
Subject: [PATCH] REname function Phase space introduced with tracking arounf
6D COD Phase space available in user interface
---
tracy/tools/Input_test.prm | 3 ---
tracy/tools/max4.cc | 6 +++---
tracy/tools/testtracy.cc | 8 ++++----
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/tracy/tools/Input_test.prm b/tracy/tools/Input_test.prm
index 0aa91f2..6c6203f 100644
--- a/tracy/tools/Input_test.prm
+++ b/tracy/tools/Input_test.prm
@@ -186,6 +186,3 @@
# calculate Eta function
EtaFlag false
-
-# calculate phase space
- PhaseSpaceFlag false
diff --git a/tracy/tools/max4.cc b/tracy/tools/max4.cc
index da8bc02..436aee8 100644
--- a/tracy/tools/max4.cc
+++ b/tracy/tools/max4.cc
@@ -217,13 +217,13 @@ prtmfile("flat_file.dat"); // writes flat file /* very important file for debu
// computes Tuneshift with amplitudes
if (TuneShiftFlag == true){
if (ChamberFlag == true ){
- NuDx(31L,21L,516L,0.025,0.005,dP);
+ TunesShiftWithAmplitude(31L,21L,516L,0.025,0.005,dP);
//NuDp(31L,516L,0.06);
//NuDp(31L,1026L,0.06);
}
else{
- NuDx(50L,30L,516L,0.035,0.02,dP);
- NuDp(31L,1026L,0.06);
+ TunesShiftWithAmplitude(50L,30L,516L,0.035,0.02,dP);
+ TunesShiftWithEnergy(31L,1026L,0.06);
}
}
diff --git a/tracy/tools/testtracy.cc b/tracy/tools/testtracy.cc
index 72c74e4..84546f2 100644
--- a/tracy/tools/testtracy.cc
+++ b/tracy/tools/testtracy.cc
@@ -280,25 +280,25 @@ void Getchrom2(double dP)
// computes TuneShift with amplitudes
if (AmplitudeTuneShiftFlag == true){
if (ChamberFlag == true ){
- NuDx(_AmplitudeTuneShift_nxpoint,
+ TunesShiftWithAmplitude(_AmplitudeTuneShift_nxpoint,
_AmplitudeTuneShift_nypoint, _AmplitudeTuneShift_nturn,
_AmplitudeTuneShift_xmax, _AmplitudeTuneShift_ymax,
_AmplitudeTuneShift_delta);
//NuDx(31L,21L,516L,0.025,0.005,dP);
}
else{ // Utility ?
- NuDx(50L,30L,516L,0.035,0.02,dP);
+ TunesShiftWithAmplitude(50L,30L,516L,0.035,0.02,dP);
}
}
if (EnergyTuneShiftFlag == true){
if (ChamberFlag == true ){
- NuDp(_EnergyTuneShift_npoint,
+ TunesShiftWithEnergy(_EnergyTuneShift_npoint,
_EnergyTuneShift_nturn, _EnergyTuneShift_deltamax);
//NuDp(31L,1026L,0.06);
}
else{ // utility ?
- NuDp(31L,1026L,0.06);
+ TunesShiftWithEnergy(31L,1026L,0.06);
}
}
--
GitLab