detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-05-01 18:30:05 +02:00
Code Issues Actions Packages Releases Activity

almost no changes - checking in for alba

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/mythenDetectorServer/Makefile
View File

@ -13,8 +13,8 @@ INSTMODE= 0777
SRCS= server.c server_funcs.c communication_funcs.c firmware_funcs.c mcb_funcs.c trimming_funcs.c sharedmemory.c SRCS= server.c server_funcs.c communication_funcs.c firmware_funcs.c mcb_funcs.c trimming_funcs.c sharedmemory.c
OBJS= $(SRCS:%.c=%.o) OBJS= $(SRCS:%.c=%.o)
CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DVERBOSE -DDACS_INT #VFLAGS= -DVERBOSE -DVERYVERBOSE
#-DVERYVERBOSE CFLAGS+= -Wall -DC_ONLY -DMCB_FUNCS -DDACS_INT $(VFLAGS)
#-Werror #-Werror
LDLIBS+= -lm LDLIBS+= -lm
@ -28,8 +28,6 @@ $(PROGS): $(OBJS)
echo $(OBJS) echo $(OBJS)
$(CC) $(LDFLAGS) $^ $(LDLIBS) $(CFLAGS) -o $@ $(CC) $(LDFLAGS) $^ $(LDLIBS) $(CFLAGS) -o $@
install: $(PROGS) install: $(PROGS)
$(INSTALL) -d $(INSTDIR) $(INSTALL) -d $(INSTDIR)
$(INSTALL) -m $(INSTMODE) $(PROGS) $(INSTDIR) $(INSTALL) -m $(INSTMODE) $(PROGS) $(INSTDIR)

5
slsDetectorSoftware/mythenDetectorServer/mcb_funcs.c
View File

@ -761,8 +761,11 @@ int getThresholdEnergy() {
} }
#ifdef VERBOSE #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)); 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); printf("Threshold energy of module %d is %d eV\n", imod, ethr);
#endif #endif

3
slsDetectorSoftware/slsDetectorAnalysis/angCalLogClass.h
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; \ nmod=0; chanspermod=0; globaloff=0; fineoff=0; angdir=1; \
strcpy(angconvfile,"none"); strcpy(ffdir,"none"); strcpy(fffile,"none"); strcpy(badfile,"none"); \ strcpy(angconvfile,"none"); strcpy(ffdir,"none"); strcpy(fffile,"none"); strcpy(badfile,"none"); \
char line[1000], myvar[100], myarg[100]; \ char line[1000], myvar[100], myarg[100]; \
@ -111,6 +111,7 @@ class angCalLogClass {
float v; float v;
infile.getline(line,1000); \ infile.getline(line,1000); \
if (sscanf(line,"%g %s",&v, datafname)<2) return -1; \ if (sscanf(line,"%g %s",&v, datafname)<2) return -1; \
printf("scanned %s to %f %s",line,v,datafname);
threshold=v; \ threshold=v; \
if (infile.bad() || infile.eof()) \ if (infile.bad() || infile.eof()) \
return -1; \ return -1; \

BIN
slsDetectorSoftware/slsDetectorAnalysis/angularConversionStatic.o
View File

Binary file not shown.

3
slsDetectorSoftware/slsDetectorAnalysis/badChannelCorrections.h
View File

@ -5,12 +5,15 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <sstream> #include <sstream>
#include <string.h>
using namespace std; using namespace std;
class badChannelCorrections{ class badChannelCorrections{
public: 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){ \ static int readBadChannelCorrectionFile(ifstream &infile, int &nbad, int *badlist, int moff=0){ \

3
slsDetectorSoftware/usersFunctions/usersFunctions.cpp
View File

@ -310,8 +310,7 @@ int defaultDataReadyFunc(detectorData* d, void* p) {
printf("Filename %s\n",d->fileName); printf("Filename %s\n",d->fileName);
printf("Number of points %d (%d)\n",d->npoints,d->npy); printf("Number of points %d (%d)\n",d->npoints,d->npy);
for(int i=0;i<d->npoints;i++){ for(int i=0;i<d->npoints;i++){
printf("%d-[%f]:%f\n",i,*(d->angles+(i*sizeof(double))),*(d->values+(i*sizeof(double)))); printf("%d-[%f]:%f\n",i,(d->angles)[i],(d->values)[i]);
fflush(stdout);
} }
printf("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU Finished \n"); printf("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU Finished \n");
#endif #endif