detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 15:20:02 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into apidhanya

Browse Source
This commit is contained in:
maliakal_d 2019-08-21 15:36:08 +02:00
commit 434aa78a04
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ctbGui/Makefile.root5
View File

@ -1,17 +1,17 @@
INCS=ctbMain.h ctbDacs.h ctbPattern.h ctbSignals.h ctbAdcs.h ctbAcquisition.h ctbPowers.h ctbSlowAdcs.h INCS=ctbMain.h ctbDacs.h ctbPattern.h ctbSignals.h ctbAdcs.h ctbAcquisition.h ctbPowers.h ctbSlowAdcs.h
SRC= $(SRC:.h=.cpp) ctbDict.cpp SRC= $(INCS:.h=.cpp) ctbDict.cpp
LINKDEF=ctbLinkDef.h LINKDEF=ctbLinkDef.h
ZMQLIB=../slsReceiverSoftware/include ZMQLIB=../slsReceiverSoftware/include
LIBRARYCBF=$(CBFLIBDIR)/lib/*.o LIBRARYCBF=$(CBFLIBDIR)/lib/*.o
INCDIR=-I../slsReceiverSoftware/include/ -I../slsDetectorSoftware/include/ -I../slsSupportLib/include/ -I../slsDetectorCalibration -I../slsDetectorCalibration/dataStructures -I$(CBFLIBDIR)/include -I../slsDetectorCalibration/interpolations INCDIR=-I../slsReceiverSoftware/include/ -I../slsDetectorSoftware/include/ -I../slsSupportLib/include/ -I../slsDetectorCalibration -I../slsDetectorCalibration/dataStructures -I$(CBFLIBDIR)/include -I../slsDetectorCalibration/interpolations
LDFLAG=-L../bin -lSlsDetector -lSlsSupport -L/usr/lib64/ -lpthread -lm -lstdc++ -lzmq -pthread -lrt -ltiff -L$(ZMQLIB) -L$(CBFLIBDIR)/lib/ -std=c++11 LDFLAG=-L../build/bin -lSlsDetector -lSlsSupport -L/usr/lib64/ -lpthread -lm -lstdc++ -lzmq -pthread -lrt -ltiff -L$(ZMQLIB) -L$(CBFLIBDIR)/lib/ -std=c++11
# #
MAIN=ctbGui.cpp MAIN=ctbGui.cpp
DESTDIR?=../bin DESTDIR?=../build/bin
OBJS = $(SRC:.cpp=.o) $(MAIN:.cpp=.o) OBJS = $(SRC:.cpp=.o) $(MAIN:.cpp=.o)
@ -30,13 +30,13 @@ ctbDict.cpp: $(INCS) $(LINKDEF)
%.o : %.cpp %.o : %.cpp
echo $@ echo $@
g++ -DMYROOT `source root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG) -o $@ -c $< $(INCDIR) g++ -DMYROOT `root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG) -o $@ -c $< $(INCDIR)
#$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -lpthread #$(FLAGS) #$(CXX) -o $@ -c $< $(INCLUDES) $(DFLAGS) -fPIC $(EPICSFLAGS) -lpthread #$(FLAGS)
$(DESTDIR)/ctbGui: $(OBJS) $(LINKDEF) $(DESTDIR)/ctbGui: $(OBJS) $(LINKDEF)
g++ -DMYROOT `source root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG) -o ctbGui $(INCDIR) $(OBJS) ../slsDetectorCalibration/tiffIO.cpp g++ -DMYROOT `root-config --cflags --glibs` -lMinuit -DCTB $(LDFLAG) -o ctbGui $(INCDIR) $(OBJS) ../slsDetectorCalibration/tiffIO.cpp
mv ctbGui $(DESTDIR) mv ctbGui $(DESTDIR)
clean: clean:

56
slsDetectorCalibration/moenchCommonMode.h
View File

@ -1,7 +1,7 @@
#ifndef MOENCHCOMMONMODE_H #ifndef MOENCHCOMMONMODE_H
#define MOENCHCOMMONMODE_H #define MOENCHCOMMONMODE_H
#include "commonModeSubtraction.h" #include "commonModeSubtractionNew.h"
class moenchCommonMode : public commonModeSubtraction { class moenchCommonMode : public commonModeSubtraction {
/** @short class to calculate the common mode noise for moench02 i.e. on 4 supercolumns separately */ /** @short class to calculate the common mode noise for moench02 i.e. on 4 supercolumns separately */
@ -9,35 +9,35 @@ class moenchCommonMode : public commonModeSubtraction {
/** constructor - initalizes a commonModeSubtraction with 4 different regions of interest /** constructor - initalizes a commonModeSubtraction with 4 different regions of interest
\param nn number of samples for the moving average \param nn number of samples for the moving average
*/ */
moenchCommonMode(int nn=1000) : commonModeSubtraction(nn,4){} ; moenchCommonMode(int nn=0) : commonModeSubtraction(0){} ;
/** add value to common mode as a function of the pixel value, subdividing the region of interest in the 4 supercolumns of 40 columns each; /* /\** add value to common mode as a function of the pixel value, subdividing the region of interest in the 4 supercolumns of 40 columns each; */
\param val value to add to the common mode /* \param val value to add to the common mode */
\param ix pixel coordinate in the x direction /* \param ix pixel coordinate in the x direction */
\param iy pixel coordinate in the y direction /* \param iy pixel coordinate in the y direction */
*/ /* *\/ */
virtual void addToCommonMode(double val, int ix=0, int iy=0) { /* virtual void addToCommonMode(double val, int ix=0, int iy=0) { */
(void) iy; /* (void) iy; */
int isc=ix/40; /* int isc=ix/40; */
if (isc>=0 && isc<nROI) { /* if (isc>=0 && isc<nROI) { */
cmPed[isc]+=val; /* cmPed[isc]+=val; */
nCm[isc]++; /* nCm[isc]++; */
} /* } */
}; /* }; */
/**returns common mode value as a function of the pixel value, subdividing the region of interest in the 4 supercolumns of 40 columns each; /* /\**returns common mode value as a function of the pixel value, subdividing the region of interest in the 4 supercolumns of 40 columns each; */
\param ix pixel coordinate in the x direction /* \param ix pixel coordinate in the x direction */
\param iy pixel coordinate in the y direction /* \param iy pixel coordinate in the y direction */
\returns common mode value /* \returns common mode value */
*/ /* *\/ */
virtual double getCommonMode(int ix=0, int iy=0) { /* virtual double getCommonMode(int ix=0, int iy=0) { */
(void) iy; /* (void) iy; */
int isc=ix/40; /* int isc=ix/40; */
if (isc>=0 && isc<nROI) { /* if (isc>=0 && isc<nROI) { */
if (nCm[isc]>0) return cmPed[isc]/nCm[isc]-cmStat[isc].Mean(); /* if (nCm[isc]>0) return cmPed[isc]/nCm[isc]-cmStat[isc].Mean(); */
} /* } */
return 0; /* return 0; */
}; /* }; */
}; };