diff --git a/tracy/tracy/src/t2cell.cc b/tracy/tracy/src/t2cell.cc index 49897509b1bb49bf73444e770a41d1fddae6988f..75d981c7bd19115f13bcc49ca55a9f336e12c135 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 2cfddda40f87c177c7807802db9bf71188b64282..6fa4039bbaf3c6fdd4db8eb66cead795fe114557 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 5a11da3f57008f66de8909b89878414b8088b9d7..6bae2a80dc9ada944e75dcd2fb03318955ac96ec 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"