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

in between moench stuff

Browse Source
This commit is contained in:
Dhanya Maliakal 2017-11-20 14:23:32 +01:00
parent c5c23e73d5
commit 99037449f4
6 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/jctbDetectorServer/firmware_funcs.c
View File

@ -4044,7 +4044,7 @@ void initializeDetector(){
setFrames(-1); setFrames(-1);
setTrains(-1); setTrains(-1);
setExposureTime(-1); setExposureTime(-1);
setPeriod(-1); setPeriod(1 * 1000 * 1000);//1ms
setDelay(-1); setDelay(-1);
setGates(-1); setGates(-1);

8
slsDetectorSoftware/jctbDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer Path: slsDetectorsPackage/slsDetectorSoftware/jctbDetectorServer
URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git URL: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git Repository Root: origin git@git.psi.ch:sls_detectors_software/sls_detector_software.git
Repsitory UUID: 2ed351b29db70212973e15b26f604a0a7fef6fcc Repsitory UUID: 9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7
Revision: 14 Revision: 16
Branch: developer Branch: developer
Last Changed Author: Dhanya_Maliakal Last Changed Author: Dhanya_Maliakal
Last Changed Rev: 1582 Last Changed Rev: 1669
Last Changed Date: 2017-09-21 16:35:15.000000002 +0200 ./firmware_funcs.c Last Changed Date: 2017-11-20 11:32:02.000000002 +0100 ./firmware_funcs.c

8
slsDetectorSoftware/jctbDetectorServer/gitInfoMoench.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git" #define SVNURL "git@git.psi.ch:sls_detectors_software/sls_detector_software.git"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "2ed351b29db70212973e15b26f604a0a7fef6fcc" #define SVNREPUUID "9701f00f9e6e9ed5563b6b5c4ace2f4a431b1db7"
//#define SVNREV 0x1582 //#define SVNREV 0x1669
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal" #define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x1582 #define SVNREV 0x1669
#define SVNDATE 0x20170921 #define SVNDATE 0x20171120
// //

BIN
slsDetectorSoftware/jctbDetectorServer/jctbDetectorServer
View File

Binary file not shown.

19
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -714,17 +714,24 @@ int slsDetector::initializeDetectorSize(detectorType type) {
thisDetector->timerValue[CYCLES_NUMBER]=1; thisDetector->timerValue[CYCLES_NUMBER]=1;
thisDetector->timerValue[SAMPLES_JCTB]=1; thisDetector->timerValue[SAMPLES_JCTB]=1;
// calculating databytes (special when with gap pixels, jctb, mythen in 24bit mode or using probes)
thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*thisDetector->dynamicRange/8; thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*thisDetector->dynamicRange/8;
thisDetector->dataBytesInclGapPixels = getTotalNumberOfChannelsInclGapPixels(X)*getTotalNumberOfChannelsInclGapPixels(Y) * thisDetector->dynamicRange/8; thisDetector->dataBytesInclGapPixels =
(thisDetector->nMod[X] * thisDetector->nChips[X] * thisDetector->nChans[X] + thisDetector->gappixels * thisDetector->nGappixels[X]) *
(thisDetector->nMod[Y] * thisDetector->nChips[Y] * thisDetector->nChans[Y] + thisDetector->gappixels * thisDetector->nGappixels[Y]) *
thisDetector->dynamicRange/8;
if(thisDetector->myDetectorType==JUNGFRAUCTB) { if(thisDetector->myDetectorType==JUNGFRAUCTB){
getTotalNumberOfChannels(); getTotalNumberOfChannels(); // recalculates nchans and databytes
// thisDetector->dataBytes=getTotalNumberOfChannels()*thisDetector->dynamicRange/8*thisDetector->timerValue[SAMPLES_JCTB]; thisDetector->dataBytesInclGapPixels = thisDetector->dataBytes;
} }
if(thisDetector->myDetectorType==MYTHEN){ else if(thisDetector->myDetectorType==MYTHEN){
if (thisDetector->dynamicRange==24 || thisDetector->timerValue[PROBES_NUMBER]>0) { if (thisDetector->dynamicRange==24 || thisDetector->timerValue[PROBES_NUMBER]>0) {
thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*4; thisDetector->dataBytes=thisDetector->nMod[X]*thisDetector->nMod[Y]*thisDetector->nChips*thisDetector->nChans*4;
thisDetector->dataBytesInclGapPixels = getTotalNumberOfChannelsInclGapPixels(X)*getTotalNumberOfChannelsInclGapPixels(Y) * thisDetector->nChans*4; thisDetector->dataBytesInclGapPixels =
(thisDetector->nMod[X] * thisDetector->nChips[X] * thisDetector->nChans[X] + thisDetector->gappixels * thisDetector->nGappixels[X]) *
(thisDetector->nMod[Y] * thisDetector->nChips[Y] * thisDetector->nChans[Y] + thisDetector->gappixels * thisDetector->nGappixels[Y]) *
4;
} }
} }

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -114,7 +114,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
int nModMax[2]; int nModMax[2];
/** maximum number of modules (nModMax[X]*nModMax[Y]) \see nModMax */ /** maximum number of modules (nModMax[X]*nModMax[Y]) \see nModMax */
int nModsMax; int nModsMax;
/** number of channels per chip */ /** number of channels per chip (used mainly in databytes calculation) */
int nChans; int nChans;
/** number of channels per chip in one direction */ /** number of channels per chip in one direction */
int nChan[2]; int nChan[2];
@ -664,7 +664,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
/** Returns the number of modules in direction d (without connecting to the detector) */ /** Returns the number of modules in direction d (without connecting to the detector) */
int getNMod(dimension d){return thisDetector->nMod[d];}; // int getNMod(dimension d){return thisDetector->nMod[d];}; //
int getChansPerMod(int imod=0){return thisDetector->nChans*thisDetector->nChips;}; int getChansPerMod(int imod=0){return thisDetector->nChan[X]*thisDetector->nChan[Y]*thisDetector->nChips;};
int getChansPerMod( dimension d,int imod=0){return thisDetector->nChan[d]*thisDetector->nChip[d];}; int getChansPerMod( dimension d,int imod=0){return thisDetector->nChan[d]*thisDetector->nChip[d];};