detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +02:00
Code Issues Actions Packages Releases Activity

solved problem on absolute channel number in raw files

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@193 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-06-15 15:30:42 +00:00
parent 69965fcb7e
commit bc85c26bdd
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -427,6 +427,7 @@ string multiSlsDetector::getHostname(int pos) {
s+=detectors[ip]->getHostname();
s+=string("+");
}
cout << s <<endl;
#ifdef VERBOSE
cout << "hostname " << s << endl;
#endif
@ -434,6 +435,7 @@ string multiSlsDetector::getHostname(int pos) {
}
return s;
}
@ -3180,6 +3182,7 @@ int multiSlsDetector::readConfigurationFile(string const fname){
#endif
setNumberOfModules(-1);
getMaxNumberOfModules();
return iline;
@ -3312,9 +3315,12 @@ int multiSlsDetector::writeDataFile(string fname, float *data, float *err, float
if (detectors[i]) {
n=detectors[i]->getTotalNumberOfChannels();
if (nch_left<nd)
if (nch_left<n)
n=nch_left;
//#ifdef VERBOSE
cout << " write " << i << " position " << off << " offset " << choff << endl;
//#endif
detectors[i]->writeDataFile(outfile,n, data+off, pe, pa, dataformat, choff);
nch_left-=n;
@ -3359,7 +3365,7 @@ int multiSlsDetector::writeDataFile(string fname, int *data) {
for (int i=0; i<thisMultiDetector->numberOfDetectors; i++) {
if (detectors[i]) {
#ifdef VERBOSE
cout << " write " << i << endl;
cout << " write " << i << " position " << off << " offset " << choff << endl;
#endif
detectors[i]->writeDataFile(outfile, detectors[i]->getTotalNumberOfChannels(), data+off, choff);
choff+=detectors[i]->getMaxNumberOfChannels();

5
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -919,7 +919,7 @@ string slsDetectorCommand::cmdHostname(int narg, char *args[], int action){
}
ostringstream os;
int ivar;//, ival;
int ivar=-1;//, ival;
string var=string(args[0]);
char hostname[1000];
@ -933,6 +933,9 @@ string slsDetectorCommand::cmdHostname(int narg, char *args[], int action){
if (vvstr.fail())
ivar=-1;
}
p=string(args[0]).find("hostname");
if (p==string::npos) {

3
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp
View File

@ -179,9 +179,6 @@ void postProcessing::doProcessing(float *lfdata, int delflag, string fname) {
// /** write raw data file */
// if (*correctionMask==0 && delflag==1) {
// // delete [] fdata;
// ;
// } else {