diff --git a/tracy/tools/Input_test.prm b/tracy/tools/Input_test.prm index 0aa91f217e3724ac383a4cbf0e603fa34eb91499..6c6203f19600a3cd7b88ee646bec544feac0bf08 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 da8bc02a440f555e0cdaed93a4f6c52a6139e9de..436aee875f952be07455783817ec58b55a501c24 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 72c74e4df2eee5c8fa275fe69787817f7d69a30b..84546f2079b159f3bc502580bd89d4b884b6a28a 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); } }