almost no changes - checking in for alba

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@263 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-09-20 08:57:44 +00:00
parent e0ad54dd46
commit d7bafd8072
6 changed files with 13 additions and 9 deletions

View File

@@ -48,7 +48,7 @@ class angCalLogClass {
//
int readHeader(ifstream &infile, char *settings, int &maxmod, int &nmod, int &chanspermod, char *angconvfile, double &globaloff, double &fineoff, int &angdir, char *ffdir, char *fffile, char *badfile ) { \
int readHeader(ifstream &infile, int &maxmod, int &nmod, int &chanspermod, char *angconvfile, double &globaloff, double &fineoff, int &angdir, char *ffdir, char *fffile, char *badfile ) { \
nmod=0; chanspermod=0; globaloff=0; fineoff=0; angdir=1; \
strcpy(angconvfile,"none"); strcpy(ffdir,"none"); strcpy(fffile,"none"); strcpy(badfile,"none"); \
char line[1000], myvar[100], myarg[100]; \
@@ -111,6 +111,7 @@ class angCalLogClass {
float v;
infile.getline(line,1000); \
if (sscanf(line,"%g %s",&v, datafname)<2) return -1; \
printf("scanned %s to %f %s",line,v,datafname);
threshold=v; \
if (infile.bad() || infile.eof()) \
return -1; \

View File

@@ -5,13 +5,16 @@
#include <iostream>
#include <fstream>
#include <sstream>
#include <string.h>
using namespace std;
class badChannelCorrections{
public:
static int readBadChannelCorrectionFile(string fname, int &nbad, int *badlist){ ifstream infile(fname.c_str()); int nb=-1; if (infile.is_open()) {nb=readBadChannelCorrectionFile(infile,nbad,badlist); infile.close();}; return nb;};
static int readBadChannelCorrectionFile(ifstream &infile, int &nbad, int *badlist, int moff=0){ \
int interrupt=0; \