diff --git a/slsDetectorSoftware/mythenDetectorServer/Makefile b/slsDetectorSoftware/mythenDetectorServer/Makefile index 108833b43..6b7a82671 100755 --- a/slsDetectorSoftware/mythenDetectorServer/Makefile +++ b/slsDetectorSoftware/mythenDetectorServer/Makefile @@ -13,9 +13,9 @@ INSTMODE= 0777 SRCS= server.c server_funcs.c communication_funcs.c firmware_funcs.c mcb_funcs.c trimming_funcs.c sharedmemory.c OBJS= $(SRCS:%.c=%.o) -CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DVERBOSE -DDACS_INT -#-DVERYVERBOSE -#-Werror +#VFLAGS= -DVERBOSE -DVERYVERBOSE +CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DDACS_INT $(VFLAGS) +#-Werror LDLIBS+= -lm @@ -28,8 +28,6 @@ $(PROGS): $(OBJS) echo $(OBJS) $(CC) $(LDFLAGS) $^ $(LDLIBS) $(CFLAGS) -o $@ - - install: $(PROGS) $(INSTALL) -d $(INSTDIR) $(INSTALL) -m $(INSTMODE) $(PROGS) $(INSTDIR) diff --git a/slsDetectorSoftware/mythenDetectorServer/mcb_funcs.c b/slsDetectorSoftware/mythenDetectorServer/mcb_funcs.c index 88b599e27..40774e26d 100755 --- a/slsDetectorSoftware/mythenDetectorServer/mcb_funcs.c +++ b/slsDetectorSoftware/mythenDetectorServer/mcb_funcs.c @@ -761,8 +761,11 @@ int getThresholdEnergy() { } #ifdef VERBOSE - //printf("module=%d gain=%f, offset=%f, dacu=%f\n",imod, myg, myo, detectorDacs[VTHRESH+imod*NDAC]); +#ifdef DACS_INT + printf("module=%d gain=%f, offset=%f, dacu=%d\n",imod, myg, myo,setDACRegister(VTHRESH,-1,imod)); +#else printf("module=%d gain=%f, offset=%f, dacu=%f\n",imod, myg, myo,setDACRegister(VTHRESH,-1,imod)); +#endif printf("Threshold energy of module %d is %d eV\n", imod, ethr); #endif diff --git a/slsDetectorSoftware/slsDetectorAnalysis/angCalLogClass.h b/slsDetectorSoftware/slsDetectorAnalysis/angCalLogClass.h index ddd086d1b..ebc12618d 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/angCalLogClass.h +++ b/slsDetectorSoftware/slsDetectorAnalysis/angCalLogClass.h @@ -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; \ diff --git a/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o b/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o deleted file mode 100644 index 0bc7d3b3d..000000000 Binary files a/slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o and /dev/null differ diff --git a/slsDetectorSoftware/slsDetectorAnalysis/badChannelCorrections.h b/slsDetectorSoftware/slsDetectorAnalysis/badChannelCorrections.h index d9101526b..61a42b0dc 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/badChannelCorrections.h +++ b/slsDetectorSoftware/slsDetectorAnalysis/badChannelCorrections.h @@ -5,13 +5,16 @@ #include #include #include +#include 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; \ diff --git a/slsDetectorSoftware/usersFunctions/usersFunctions.cpp b/slsDetectorSoftware/usersFunctions/usersFunctions.cpp index 99325dbb1..ad0948007 100644 --- a/slsDetectorSoftware/usersFunctions/usersFunctions.cpp +++ b/slsDetectorSoftware/usersFunctions/usersFunctions.cpp @@ -310,8 +310,7 @@ int defaultDataReadyFunc(detectorData* d, void* p) { printf("Filename %s\n",d->fileName); printf("Number of points %d (%d)\n",d->npoints,d->npy); for(int i=0;inpoints;i++){ - printf("%d-[%f]:%f\n",i,*(d->angles+(i*sizeof(double))),*(d->values+(i*sizeof(double)))); - fflush(stdout); + printf("%d-[%f]:%f\n",i,(d->angles)[i],(d->values)[i]); } printf("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU Finished \n"); #endif