Commit 34f6a56e authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

z handling in oixy now as in oi

parent 80dc909a
- z handling in oixy now as in oi
Release 2.3.5a of 01feb17:
- CMake machinery now uses variables like ${library_name}_LIBRARY
......
......@@ -283,9 +283,9 @@ void NOperate::Integral()
else
fout = POld((dynamic_cast<const COld*>(fin))->new_POld());
fout->log_action("oi " + expr);
fout->ZCo.pop_back();
fout->xco = fin->ZCo.back();
fout->yco = T->node_coord(k);
fout->ZCo.pop_back();
sout = PSpec(new CSpec);
sout->z = fin->V[0]->z;
sout->z.pop_back();
......@@ -364,10 +364,15 @@ void NOperate::IntXY(string mode)
fout->xco = xco;
fout->yco = yco;
fout->ZCo.pop_back();
PSpec sout(new CSpec);
sout->z = fin->V[0]->z;
sout->z.pop_back();
for (int j = 0; j < fin->nJ(); j++) {
if (fin->V[j]->frozen)
continue;
int n = fin->nPts(j);
if (icolx >= n || icoly >= n || (with_d && icold >= n))
throw "not enough columns in spectrum " + S(j);
......@@ -375,12 +380,13 @@ void NOperate::IntXY(string mode)
sout->push_xyd(fin->VS(j)->y[icolx], fin->VS(j)->y[icoly], fin->VS(j)->y[icold]);
else
sout->push_xy(fin->VS(j)->y[icolx], fin->VS(j)->y[icoly]);
sout->z = fin->VS(j)->z;
if (nz > 2) { // new spectrum if jump in other z value
if (j + 1 < fin->nJ()
&& fin->V[j + 1]->z[nz - 2]->to_r() != fin->V[j]->z[nz - 2]->to_r()) {
if (nz >= 2) { // new spectrum if jump in other z values
double zval = fin->V[j]->z[nz - 2]->to_r();
if (j + 1 < fin->nJ() && fin->V[j + 1]->z[nz - 2]->to_r() != zval) {
fout->V.push_back(move(sout));
sout = PSpec(new CSpec);
sout->z = fin->V[j + 1]->z;
sout->z.pop_back();
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment