mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-21 00:58:01 +02:00
some more changes in the acquisition function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@172 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
@ -18,31 +18,16 @@ void slsDetectorUtils::acquire(int delflag){
|
||||
|
||||
#ifdef VERBOSE
|
||||
cout << "Acquire function "<< delflag << endl;
|
||||
#endif
|
||||
|
||||
#ifdef VERBOSE
|
||||
cout << "Stopped flag is "<< stoppedFlag << delflag << endl;
|
||||
#endif
|
||||
|
||||
|
||||
posfinished=0;
|
||||
|
||||
|
||||
void *status;
|
||||
int trimbit;
|
||||
|
||||
setStartIndex(*fileIndex);
|
||||
|
||||
// int lastindex=startindex, nowindex=startindex;
|
||||
|
||||
|
||||
|
||||
|
||||
char cmd[MAX_STR_LENGTH];
|
||||
int startindex=*fileIndex;
|
||||
int nowindex=startindex, lastindex=startindex;
|
||||
string fn;
|
||||
|
||||
|
||||
|
||||
|
||||
//string sett;
|
||||
if ((*correctionMask&(1<< ANGULAR_CONVERSION)) || (*correctionMask&(1<< I0_NORMALIZATION)))
|
||||
connect_channels();
|
||||
|
||||
@ -54,16 +39,14 @@ void slsDetectorUtils::acquire(int delflag){
|
||||
|
||||
|
||||
|
||||
|
||||
pthread_mutex_lock(&mp);
|
||||
resetFinalDataQueue();
|
||||
resetDataQueue();
|
||||
|
||||
|
||||
//cout << "main mutex lock line 6188" << endl;
|
||||
pthread_mutex_lock(&mp);
|
||||
jointhread=0;
|
||||
queuesize=0;
|
||||
posfinished=0;
|
||||
pthread_mutex_unlock(&mp);
|
||||
//cout << "main mutex unlock line 6188" << endl;
|
||||
|
||||
|
||||
|
||||
@ -75,9 +58,6 @@ void slsDetectorUtils::acquire(int delflag){
|
||||
startThread(delflag);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//cout << "data thread started " << endl;
|
||||
int np=1;
|
||||
if (*numberOfPositions>0)
|
||||
@ -87,64 +67,30 @@ void slsDetectorUtils::acquire(int delflag){
|
||||
if (*actionMask & (1 << MAX_ACTIONS)) {
|
||||
ns0=nScanSteps[0];
|
||||
}
|
||||
|
||||
if (ns0<1)
|
||||
ns0=1;
|
||||
|
||||
|
||||
int ns1=1;
|
||||
if (*actionMask & (1 << (MAX_ACTIONS+1))) {
|
||||
ns1=nScanSteps[1];
|
||||
}
|
||||
|
||||
if (ns1<1)
|
||||
ns1=1;
|
||||
|
||||
|
||||
|
||||
|
||||
//cout << "action at start" << endl;
|
||||
if (*stoppedFlag==0) {
|
||||
if (*actionMask & (1 << startScript)) {
|
||||
//"Custom start script. The arguments are passed as nrun=n par=p.");
|
||||
sprintf(cmd,"%s nrun=%d par=%s",getActionScript(startScript).c_str(),*fileIndex,getActionParameter(startScript).c_str());
|
||||
#ifdef VERBOSE
|
||||
cout << "Executing start script " << cmd << endl;
|
||||
#endif
|
||||
system(cmd);
|
||||
}
|
||||
executeAction(startScript);
|
||||
}
|
||||
|
||||
for (int is0=0; is0<ns0; is0++) {
|
||||
// cout << "scan0 loop" << endl;
|
||||
|
||||
if (*stoppedFlag==0) {
|
||||
|
||||
currentScanVariable[0]=getScanStep(0,is0);
|
||||
currentScanIndex[0]=is0;
|
||||
|
||||
switch(scanMode[0]) {
|
||||
case 1:
|
||||
setThresholdEnergy((int)currentScanVariable[0]); //energy scan
|
||||
break;
|
||||
case 2:
|
||||
setDAC(currentScanVariable[0],THRESHOLD); // threshold scan
|
||||
break;
|
||||
case 3:
|
||||
trimbit=(int)currentScanVariable[0];
|
||||
setChannel((trimbit<<((int)TRIMBIT_OFF))|((int)COMPARATOR_ENABLE)); // trimbit scan
|
||||
break;
|
||||
case 0:
|
||||
currentScanVariable[0]=0;
|
||||
break;
|
||||
default:
|
||||
//Custom scan script level 0. The arguments are passed as nrun=n fn=filename var=v par=p"
|
||||
sprintf(cmd,"%s nrun=%d fn=%s var=%f par=%s",getScanScript(0).c_str(),*fileIndex,createFileName().c_str(),currentScanVariable[0],getScanParameter(0).c_str());
|
||||
#ifdef VERBOSE
|
||||
cout << "Executing scan script 0 " << cmd << endl;
|
||||
#endif
|
||||
system(cmd);
|
||||
|
||||
|
||||
}
|
||||
executeScan(0,is0);
|
||||
} else
|
||||
break;
|
||||
|
||||
@ -153,45 +99,12 @@ void slsDetectorUtils::acquire(int delflag){
|
||||
// cout << "scan1 loop" << endl;
|
||||
|
||||
if (*stoppedFlag==0) {
|
||||
|
||||
currentScanVariable[1]=getScanStep(1,is1);
|
||||
currentScanIndex[1]=is1;
|
||||
|
||||
switch(scanMode[1]) {
|
||||
case 1:
|
||||
setThresholdEnergy((int)currentScanVariable[1]); //energy scan
|
||||
break;
|
||||
case 2:
|
||||
setDAC(currentScanVariable[1],THRESHOLD); // threshold scan
|
||||
break;
|
||||
case 3:
|
||||
trimbit=(int)currentScanVariable[1];
|
||||
setChannel((trimbit<<((int)TRIMBIT_OFF))|((int)COMPARATOR_ENABLE)); // trimbit scan
|
||||
break;
|
||||
case 0:
|
||||
currentScanVariable[1]=0;
|
||||
break;
|
||||
default:
|
||||
//Custom scan script level 1. The arguments are passed as nrun=n fn=filename var=v par=p"
|
||||
sprintf(cmd,"%s nrun=%d fn=%s var=%f par=%s",getScanScript(1).c_str(),*fileIndex,createFileName().c_str(),currentScanVariable[1],getScanParameter(1).c_str());
|
||||
#ifdef VERBOSE
|
||||
cout << "Executing scan script 1 " << cmd << endl;
|
||||
#endif
|
||||
system(cmd);
|
||||
}
|
||||
|
||||
executeScan(1,is1);
|
||||
} else
|
||||
break;
|
||||
|
||||
if (*stoppedFlag==0) {
|
||||
if (*actionMask & (1 << scriptBefore)) {
|
||||
//Custom script before each frame. The arguments are passed as nrun=n fn=filename par=p sv0=scanvar0 sv1=scanvar1 p0=par0 p1=par1"
|
||||
sprintf(cmd,"%s nrun=%d fn=%s par=%s sv0=%f sv1=%f p0=%s p1=%s",getActionScript(scriptBefore).c_str(),*fileIndex,createFileName().c_str(),getActionParameter(scriptBefore).c_str(),currentScanVariable[0],currentScanVariable[1],getScanParameter(0).c_str(),getScanParameter(1).c_str());
|
||||
#ifdef VERBOSE
|
||||
cout << "Executing script before " << cmd << endl;
|
||||
#endif
|
||||
system(cmd);
|
||||
}
|
||||
executeAction(scriptBefore);
|
||||
} else
|
||||
break;
|
||||
|
||||
@ -210,47 +123,9 @@ void slsDetectorUtils::acquire(int delflag){
|
||||
} else
|
||||
break;
|
||||
|
||||
//write header before?
|
||||
//cmd=headerBeforeScript;
|
||||
//Custom script to write the header. \n The arguments will be passed as nrun=n fn=filenam acqtime=t gainmode=g threshold=thr badfile=badf angfile=angf bloffset=blo fineoffset=fo fffile=fffn tau=deadtau par=p")
|
||||
|
||||
// cout << "aaaaa" << endl;
|
||||
//cout << createFileName() << endl;
|
||||
//cout << "bbbbb" << endl;
|
||||
fn=createFileName();
|
||||
//cout << fn << endl;
|
||||
nowindex=*fileIndex;
|
||||
|
||||
if (*stoppedFlag==0) {
|
||||
|
||||
|
||||
if (*correctionMask&(1<< I0_NORMALIZATION))
|
||||
currentI0=get_i0();
|
||||
|
||||
// cout << "header " << endl;
|
||||
if (*actionMask & (1 << headerBefore)) {
|
||||
//Custom script after each frame. The arguments are passed as nrun=n fn=filename par=p sv0=scanvar0 sv1=scanvar1 p0=par0 p1=par1"
|
||||
sprintf(cmd,"%s nrun=%d fn=%s acqtime=%f gainmode=%d threshold=%d badfile=%s angfile=%s bloffset=%f fineoffset=%f fffile=%s/%s tau=%f par=%s",\
|
||||
getActionScript(headerBefore).c_str(),\
|
||||
nowindex,\
|
||||
fn.c_str(), \
|
||||
((float)timerValue[ACQUISITION_TIME])*1E-9, \
|
||||
*currentSettings, \
|
||||
*currentThresholdEV, \
|
||||
getBadChannelCorrectionFile().c_str(), \
|
||||
angularConversion::getAngularConversionFile().c_str(), \
|
||||
*globalOffset, \
|
||||
*fineOffset,\
|
||||
getFlatFieldCorrectionDir().c_str(),\
|
||||
getFlatFieldCorrectionFile().c_str(), \
|
||||
getRateCorrectionTau(),\
|
||||
getActionParameter(headerBefore).c_str()\
|
||||
);
|
||||
#ifdef VERBOSE
|
||||
cout << "Executing header before " << cmd << endl;
|
||||
#endif
|
||||
system(cmd);
|
||||
}
|
||||
executeAction(scriptBefore);
|
||||
} else
|
||||
break;
|
||||
|
||||
@ -258,44 +133,42 @@ void slsDetectorUtils::acquire(int delflag){
|
||||
|
||||
if (*stoppedFlag==0) {
|
||||
|
||||
if (*correctionMask&(1<< ANGULAR_CONVERSION)) {
|
||||
pthread_mutex_lock(&mp);
|
||||
currentPosition=get_position();
|
||||
posfinished=0;
|
||||
pthread_mutex_unlock(&mp);
|
||||
}
|
||||
|
||||
|
||||
// cout << "starting???? " << endl;
|
||||
startAndReadAll();
|
||||
|
||||
pthread_mutex_lock(&mp);
|
||||
posfinished=1;
|
||||
pthread_mutex_unlock(&mp);
|
||||
|
||||
#ifdef VERBOSE
|
||||
cout << "returned " << endl;
|
||||
pthread_mutex_lock(&mp);
|
||||
cout << "AAAA queue size " << dataQueue.size()<< endl;
|
||||
pthread_mutex_unlock(&mp);
|
||||
#endif
|
||||
|
||||
executeAction(headerBefore);
|
||||
|
||||
if (*correctionMask&(1<< I0_NORMALIZATION))
|
||||
currentI0=get_i0()-currentI0;
|
||||
if (*correctionMask&(1<< ANGULAR_CONVERSION)) {
|
||||
pthread_mutex_lock(&mp);
|
||||
currentPosition=get_position();
|
||||
posfinished=0;
|
||||
pthread_mutex_unlock(&mp);
|
||||
}
|
||||
|
||||
if (*correctionMask&(1<< I0_NORMALIZATION))
|
||||
get_i0(0);
|
||||
|
||||
startAndReadAll();
|
||||
|
||||
if (*correctionMask&(1<< I0_NORMALIZATION))
|
||||
currentI0=get_i0(1); // this is the correct i0!!!!!
|
||||
|
||||
pthread_mutex_lock(&mp);
|
||||
posfinished=1;
|
||||
pthread_mutex_unlock(&mp);
|
||||
|
||||
|
||||
|
||||
////////////////// Reput in in case of unthreaded processing
|
||||
if (*threadedProcessing==0){
|
||||
#ifdef VERBOSE
|
||||
cout << "start unthreaded process data " << endl;
|
||||
#endif
|
||||
processData(delflag);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
} else
|
||||
break;
|
||||
|
||||
|
||||
// wait until data processing thread has finished the data
|
||||
|
||||
pthread_mutex_lock(&mp);
|
||||
while (queuesize){
|
||||
pthread_mutex_unlock(&mp);
|
||||
@ -303,122 +176,75 @@ void slsDetectorUtils::acquire(int delflag){
|
||||
pthread_mutex_lock(&mp);
|
||||
}
|
||||
pthread_mutex_unlock(&mp);
|
||||
|
||||
if (*stoppedFlag==0) {
|
||||
if (*actionMask & (1 << headerAfter)) {
|
||||
//Custom script after each frame. The arguments are passed as nrun=n fn=filename par=p sv0=scanvar0 sv1=scanvar1 p0=par0 p1=par1"
|
||||
sprintf(cmd,"%s nrun=%d fn=%s acqtime=%f gainmode=%d threshold=%d badfile=%s angfile=%s bloffset=%f fineoffset=%f fffile=%s/%s tau=%f par=%s", \
|
||||
getActionScript(headerAfter).c_str(), \
|
||||
nowindex, \
|
||||
fn.c_str(), \
|
||||
((float)timerValue[ACQUISITION_TIME])*1E-9, \
|
||||
*currentSettings, \
|
||||
*currentThresholdEV, \
|
||||
getBadChannelCorrectionFile().c_str(), \
|
||||
angularConversion::getAngularConversionFile().c_str(), \
|
||||
*globalOffset, \
|
||||
*fineOffset, \
|
||||
getFlatFieldCorrectionDir().c_str(), \
|
||||
getFlatFieldCorrectionFile().c_str(), \
|
||||
getRateCorrectionTau(), \
|
||||
getActionParameter(headerAfter).c_str());
|
||||
#ifdef VERBOSE
|
||||
cout << "Executing header after " << cmd << endl;
|
||||
#endif
|
||||
system(cmd);
|
||||
|
||||
}
|
||||
if (*fileIndex>lastindex)
|
||||
lastindex=*fileIndex;
|
||||
} else {
|
||||
|
||||
|
||||
if (*fileIndex>lastindex)
|
||||
lastindex=*fileIndex;
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (*stoppedFlag==0) {
|
||||
executeAction(headerAfter);
|
||||
setLastIndex(*fileIndex);
|
||||
} else {
|
||||
setLastIndex(*fileIndex);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (*stoppedFlag) {
|
||||
if (*stoppedFlag) {
|
||||
#ifdef VERBOSE
|
||||
std::cout<< "exiting since the detector has been stopped" << std::endl;
|
||||
std::cout<< "exiting since the detector has been stopped" << std::endl;
|
||||
#endif
|
||||
break;
|
||||
} else if (ip<(np-1)) {
|
||||
*fileIndex=startindex;
|
||||
}
|
||||
break;
|
||||
} else if (ip<(np-1)) {
|
||||
*fileIndex=setStartIndex();
|
||||
}
|
||||
} // loop on position finished
|
||||
|
||||
//script after
|
||||
if (*stoppedFlag==0) {
|
||||
if (*actionMask & (1 << scriptAfter)) {
|
||||
//Custom script after each frame. The arguments are passed as nrun=n fn=filename par=p sv0=scanvar0 sv1=scanvar1 p0=par0 p1=par1"
|
||||
sprintf(cmd,"%s nrun=%d fn=%s par=%s sv0=%f sv1=%f p0=%s p1=%s",getActionScript(scriptAfter).c_str(),*fileIndex,createFileName().c_str(),getActionParameter(scriptAfter).c_str(),currentScanVariable[0],currentScanVariable[1],getScanParameter(0).c_str(),getScanParameter(1).c_str());
|
||||
#ifdef VERBOSE
|
||||
cout << "Executing script after " << cmd << endl;
|
||||
#endif
|
||||
system(cmd);
|
||||
}
|
||||
} else
|
||||
break;
|
||||
|
||||
|
||||
|
||||
//script after
|
||||
if (*stoppedFlag==0) {
|
||||
executeAction(scriptAfter);
|
||||
} else
|
||||
break;
|
||||
|
||||
|
||||
if (*stoppedFlag) {
|
||||
#ifdef VERBOSE
|
||||
std::cout<< "exiting since the detector has been stopped" << std::endl;
|
||||
#endif
|
||||
break;
|
||||
} else if (is1<(ns1-1)) {
|
||||
*fileIndex=startindex;
|
||||
*fileIndex=setStartIndex();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
//end scan1 loop is1
|
||||
//currentScanVariable[MAX_SCAN_LEVELS];
|
||||
|
||||
|
||||
if (*stoppedFlag) {
|
||||
if (*stoppedFlag) {
|
||||
#ifdef VERBOSE
|
||||
std::cout<< "exiting since the detector has been stopped" << std::endl;
|
||||
std::cout<< "exiting since the detector has been stopped" << std::endl;
|
||||
#endif
|
||||
break;
|
||||
} else if (is0<(ns0-1)) {
|
||||
*fileIndex=startindex;
|
||||
}
|
||||
break;
|
||||
} else if (is0<(ns0-1)) {
|
||||
*fileIndex=setStartIndex();
|
||||
}
|
||||
|
||||
} //end scan0 loop is0
|
||||
|
||||
*fileIndex=lastindex;
|
||||
*fileIndex=setLastIndex();
|
||||
if (*stoppedFlag==0) {
|
||||
if (*actionMask & (1 << stopScript)) {
|
||||
//Custom stop script. The arguments are passed as nrun=n par=p.
|
||||
sprintf(cmd,"%s nrun=%d par=%s",getActionScript(stopScript).c_str(),*fileIndex,getActionParameter(stopScript).c_str());
|
||||
#ifdef VERBOSE
|
||||
cout << "Executing stop script " << cmd << endl;
|
||||
#endif
|
||||
system(cmd);
|
||||
}
|
||||
executeAction(stopScript);
|
||||
}
|
||||
|
||||
|
||||
// waiting for the data processing thread to finish!
|
||||
if (*threadedProcessing) {
|
||||
//#ifdef VERBOSE
|
||||
// std::cout<< " ***********************waiting for data processing thread to finish " << queuesize <<" " << thisDetector->fileIndex << std::endl ;
|
||||
//#endif
|
||||
//cout << "main mutex lock line 6488" << endl;
|
||||
pthread_mutex_lock(&mp);
|
||||
jointhread=1;
|
||||
pthread_mutex_unlock(&mp);
|
||||
//cout << "main mutex unlock line 6488" << endl;
|
||||
pthread_join(dataProcessingThread, &status);
|
||||
// std::cout<< " ***********************data processing finished " << queuesize <<" " << thisDetector->fileIndex << std::endl ;
|
||||
}
|
||||
|
||||
if ((*correctionMask&(1<< ANGULAR_CONVERSION)) || (*correctionMask&(1<< I0_NORMALIZATION)))
|
||||
disconnect_channels();
|
||||
|
||||
if ((*correctionMask&(1<< ANGULAR_CONVERSION)) || (*correctionMask&(1<< I0_NORMALIZATION)))
|
||||
disconnect_channels();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user