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

set settings for eiger, fixd big bug in slsusers for exposures, period etc

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@623 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d 2013-06-21 14:24:02 +00:00
parent 5a2018fc6f
commit 47377a02e9
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2650,7 +2650,6 @@ slsDetectorDefs::sls_detector_module *slsDetector::getModule(int imod){
deleteModule(myMod); deleteModule(myMod);
myMod=NULL; myMod=NULL;
} }
return myMod; return myMod;
} }
@ -2875,22 +2874,9 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
//create file names //create file names
switch(thisDetector->myDetectorType){ switch(thisDetector->myDetectorType){
case EIGER: case EIGER:
ostfn << thisDetector->settingsDir << ssettings <<"/settings.sn";// << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im) << setbase(10);
oscfn << thisDetector->calDir << ssettings << "/calibration.sn";// << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im) << setbase(10);
//add the trimbits binary file - temp solution
nch=((myMod->nchan)/(myMod->nchip));
for (ichip=0; ichip<myMod->nchip; ichip++) {
myMod->chipregs[ichip]=0;
for (ichan=0; ichan<nch; ichan++){
myMod->chanregs[ichip*nch+ichan]=0;
}
}
break;
case MOENCH: case MOENCH:
case GOTTHARD: case GOTTHARD:
//settings is saved in myMod.reg for gotthard //settings is saved in myMod.reg
myMod->reg=thisDetector->currentSettings; myMod->reg=thisDetector->currentSettings;
ostfn << thisDetector->settingsDir << ssettings <<"/settings.sn";// << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im) << setbase(10); ostfn << thisDetector->settingsDir << ssettings <<"/settings.sn";// << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im) << setbase(10);
oscfn << thisDetector->calDir << ssettings << "/calibration.sn";// << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im) << setbase(10); oscfn << thisDetector->calDir << ssettings << "/calibration.sn";// << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im) << setbase(10);
@ -2917,6 +2903,7 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
} else { } else {
ostringstream ostfn,oscfn; ostringstream ostfn,oscfn;
switch(thisDetector->myDetectorType){ switch(thisDetector->myDetectorType){
case EIGER:
case MOENCH: case MOENCH:
case GOTTHARD: case GOTTHARD:
ostfn << thisDetector->settingsDir << ssettings << ssettings << ".settings"; ostfn << thisDetector->settingsDir << ssettings << ssettings << ".settings";

10
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -155,7 +155,7 @@ int slsDetectorUsers::setBeamEnergy(int e_eV){
double slsDetectorUsers::setExposureTime(double t, bool inseconds){ double slsDetectorUsers::setExposureTime(double t, bool inseconds){
int64_t tms = t * (1E+9); int64_t tms = t * (1E+9);
if (t < 0) tms = -1; if (t < 0) tms = -1;
if(inseconds) if(!inseconds)
return myDetector->setExposureTime(t); return myDetector->setExposureTime(t);
else else
return ((1E-9) * (double)myDetector->setExposureTime(tms)); return ((1E-9) * (double)myDetector->setExposureTime(tms));
@ -164,8 +164,8 @@ double slsDetectorUsers::setExposureTime(double t, bool inseconds){
double slsDetectorUsers::setExposurePeriod(double t, bool inseconds){ double slsDetectorUsers::setExposurePeriod(double t, bool inseconds){
int64_t tms = t * (1E+9); int64_t tms = t * (1E+9);
if (t < 0) tms = -1; if (t < 0) tms = -1;
if(inseconds) if(!inseconds)
return myDetector->setExposureTime(t); return myDetector->setExposurePeriod(t);
else else
return ((1E-9) * (double)myDetector->setExposurePeriod(tms)); return ((1E-9) * (double)myDetector->setExposurePeriod(tms));
} }
@ -173,8 +173,8 @@ double slsDetectorUsers::setExposurePeriod(double t, bool inseconds){
double slsDetectorUsers::setDelayAfterTrigger(double t, bool inseconds){ double slsDetectorUsers::setDelayAfterTrigger(double t, bool inseconds){
int64_t tms = t * (1E+9); int64_t tms = t * (1E+9);
if (t < 0) tms = -1; if (t < 0) tms = -1;
if(inseconds) if(!inseconds)
return myDetector->setExposureTime(t); return myDetector->setDelayAfterTrigger(t);
else else
return ((1E-9) * (double)myDetector->setDelayAfterTrigger(tms)); return ((1E-9) * (double)myDetector->setDelayAfterTrigger(tms));
} }

6
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@ -2,10 +2,10 @@
#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x616 //#define SVNREV 0x621
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "l_maliakal_d" #define SVNAUTHLIB "l_maliakal_d"
#define SVNREVLIB 0x616 #define SVNREVLIB 0x621
#define SVNDATELIB 0x20130619 #define SVNDATELIB 0x20130620
// //