From 3cff4f8b6faaf25dcb0edddeabe6196476f52488 Mon Sep 17 00:00:00 2001
From: nadolski <nadolski@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Tue, 17 Feb 2015 12:05:17 +0000
Subject: [PATCH] absorber hit: remplace nan by 1.0
---
tracy/tracy/src/t2cell.cc | 4 ++--
tracy/tracy/src/t2elem.cc | 4 ++--
tracy/tracy/src/t2lat.cc | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tracy/tracy/src/t2cell.cc b/tracy/tracy/src/t2cell.cc
index 4989750..75d981c 100644
--- a/tracy/tracy/src/t2cell.cc
+++ b/tracy/tracy/src/t2cell.cc
@@ -38,12 +38,12 @@ inline bool CheckAmpl(const ss_vect<T> &x, const long int loc)
if (globval.Aperture_on)
not_lost = is_double<T>::cst(x[x_]) > Cell[loc].maxampl[X_][0] &&
is_double<T>::cst(x[x_]) < Cell[loc].maxampl[X_][1] &&
- is_double<T>::cst(x[y_]) > Cell[loc].maxampl[Y_][0] &&
+ is_double<T>::cst(x[y_]) > Cell[loc].maxampl[Y_][0] &&
is_double<T>::cst(x[y_]) < Cell[loc].maxampl[Y_][1];
else
not_lost = is_double<T>::cst(x[x_]) > -max_ampl &&
is_double<T>::cst(x[x_]) < +max_ampl &&
- is_double<T>::cst(x[y_]) > -max_ampl &&
+ is_double<T>::cst(x[y_]) > -max_ampl &&
is_double<T>::cst(x[y_]) < +max_ampl;
// particle lost
diff --git a/tracy/tracy/src/t2elem.cc b/tracy/tracy/src/t2elem.cc
index 2cfddda..6fa4039 100644
--- a/tracy/tracy/src/t2elem.cc
+++ b/tracy/tracy/src/t2elem.cc
@@ -1218,7 +1218,7 @@ void Aperture_Pass(CellType &Cell, ss_vect<T> &X) {
}
if (outofrange) {
- X[y_] = NAN;
+ X[y_] = 1.0;
return;
}
@@ -1245,7 +1245,7 @@ void Aperture_Pass(CellType &Cell, ss_vect<T> &X) {
}
if (outofrange) {
- X[x_] = NAN;
+ X[x_] = 1.0;
return;
}
diff --git a/tracy/tracy/src/t2lat.cc b/tracy/tracy/src/t2lat.cc
index 5a11da3..6bae2a8 100644
--- a/tracy/tracy/src/t2lat.cc
+++ b/tracy/tracy/src/t2lat.cc
@@ -4471,7 +4471,7 @@ void PrintResult(struct LOC_Lattice_Read *LINK)
newtime = GetTime();
printf("\n");
- printf(" TRACY III v. 3.5 compiled on %s\n",__DATE__);
+ printf(" TRACY III v. 3.11 compiled on %s\n",__DATE__);
printf("\n");
printf(" LATTICE Statistics for today %s \n\n", asctime2(newtime));
printf(" Number of constants: UDIC =%5ld"
--
GitLab