Adjusted msr2data that it works together with the NeXus reading routine which explicitly writes the ring-anode vector
This commit is contained in:
@ -1880,14 +1880,18 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, unsigned int withHead
|
|||||||
|
|
||||||
PDoubleVector ra(rawRunData->GetRingAnode());
|
PDoubleVector ra(rawRunData->GetRingAnode());
|
||||||
if (ra.size() > 1) {
|
if (ra.size() > 1) {
|
||||||
dataParamNames.push_back("dataRALRAR");
|
if ((ra[0] != PMUSR_UNDEFINED) && (ra[1] != PMUSR_UNDEFINED)) {
|
||||||
dataParamLabels.push_back("RAL-RAR (kV)");
|
dataParamNames.push_back("dataRALRAR");
|
||||||
dataParam.push_back(ra[0]-ra[1]);
|
dataParamLabels.push_back("RAL-RAR (kV)");
|
||||||
|
dataParam.push_back(ra[0]-ra[1]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (ra.size() == 4) {
|
if (ra.size() == 4) {
|
||||||
dataParamNames.push_back("dataRATRAB");
|
if ((ra[2] != PMUSR_UNDEFINED) && (ra[3] != PMUSR_UNDEFINED)) {
|
||||||
dataParamLabels.push_back("RAT-RAB (kV)");
|
dataParamNames.push_back("dataRATRAB");
|
||||||
dataParam.push_back(ra[2]-ra[3]);
|
dataParamLabels.push_back("RAT-RAB (kV)");
|
||||||
|
dataParam.push_back(ra[2]-ra[3]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
rawRunData = 0;
|
rawRunData = 0;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user