From d7bafd80727b06f6077110fd50ac7c92dd0c0519 Mon Sep 17 00:00:00 2001 From: bergamaschi Date: Thu, 20 Sep 2012 08:57:44 +0000 Subject: [PATCH] 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 --- .../mythenDetectorServer/Makefile | 8 +++----- .../mythenDetectorServer/mcb_funcs.c | 5 ++++- .../slsDetectorAnalysis/angCalLogClass.h | 3 ++- .../angularConversionStatic.o | Bin 11384 -> 0 bytes .../slsDetectorAnalysis/badChannelCorrections.h | 3 +++ .../usersFunctions/usersFunctions.cpp | 3 +-- 6 files changed, 13 insertions(+), 9 deletions(-) delete mode 100644 slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o 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 0bc7d3b3dc0482914539a8ee3ba66f0cf940a83c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11384 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 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