From c9a952a748b37d36ba8a6b8b7ddfa831ce29d2d6 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Wed, 19 Aug 2015 11:38:09 +0200 Subject: [PATCH] changing file name prefix orders, reset frames caught command from command line --- .../bin/eigerDetectorServer | Bin 242224 -> 242224 bytes .../slsDetector/slsDetectorCommand.cpp | 17 +++++++++++++++ .../slsDetectorAnalysis/fileIOStatic.h | 20 +++++++++--------- .../slsDetectorAnalysis/postProcessing.cpp | 6 +++--- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer b/slsDetectorSoftware/eigerDetectorServer/bin/eigerDetectorServer index 2b69b4c2d2baa2107baeb648c1da9ece21070e2f..45bfaa326b1d7db3e39b06746e3378665faa6e37 100755 GIT binary patch delta 18177 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 T@bPq>R&FXn3Eo<6%8vd&C1_7$ delta 18354 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 == FAIL) + strcpy(answer,"failed"); + else + strcpy(answer,"successful"); + return string(answer); + } + } + else if(cmd=="frameindex"){ if (action==PUT_ACTION) return string("cannot put"); @@ -4328,6 +4344,7 @@ string slsDetectorCommand::helpReceiver(int narg, char *args[], int action) { ostringstream os; if (action==PUT_ACTION || action==HELP_ACTION) { os << "receiver [status] \t starts/stops the receiver to listen to detector packets. - can be start or stop" << std::endl; + os << "resetframescaught [any value] \t resets frames caught by receiver" << std::endl; os << "r_readfreq \t sets the gui read frequency of the receiver, 0 if gui requests frame, >0 if receiver sends every nth frame to gui" << std::endl; os << "tengiga \t sets system to be configure for 10Gbe if set to 1, else 1Gbe if set to 0" << std::endl; } diff --git a/slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h b/slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h index 6bc657317..d5cffcc03 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h +++ b/slsDetectorSoftware/slsDetectorAnalysis/fileIOStatic.h @@ -59,11 +59,11 @@ class fileIOStatic { static string createFileName(char *filepath, char *filename, int aMask, double sv0, int prec0, double sv1, int prec1, int pindex, int npos, int findex, int frameindex=-1, int detindex=-1){ \ ostringstream osfn; \ osfn << filepath << "/" << filename; \ - if(detindex>=0) osfn << "_d"<< detindex; \ if ( aMask& (1 << (slsDetectorDefs::MAX_ACTIONS))) osfn << "_S" << fixed << setprecision(prec0) << sv0; \ if (aMask & (1 << (slsDetectorDefs::MAX_ACTIONS+1))) osfn << "_s" << fixed << setprecision(prec1) << sv1; \ if (pindex>0 && pindex<=npos) osfn << "_p" << pindex; \ if(frameindex>=0) osfn << "_f" << frameindex; \ + if(detindex>=0) osfn << "_d"<< detindex; \ osfn << "_" << findex; \ return osfn.str(); \ }; @@ -89,10 +89,10 @@ class fileIOStatic { static string createReceiverFilePrefix(char *filename, int aMask, double sv0, int prec0, double sv1, int prec1, int pindex, int npos,int detindex=-1){ \ ostringstream osfn; \ osfn << filename; \ - if(detindex!=-1) osfn << "_d"<< detindex; \ if ( aMask& (1 << (slsDetectorDefs::MAX_ACTIONS))) osfn << "_S" << fixed << setprecision(prec0) << sv0; \ if (aMask & (1 << (slsDetectorDefs::MAX_ACTIONS+1))) osfn << "_s" << fixed << setprecision(prec1) << sv1; \ if (pindex>0 && pindex<=npos) osfn << "_p" << pindex; \ + if(detindex!=-1) osfn << "_d"<< detindex; \ return osfn.str(); \ }; @@ -218,6 +218,11 @@ class fileIOStatic { } \ else cout << "******************************** cannot parse frame index" << endl; \ uscore=s.rfind("_"); \ + if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"d%d",&i)) { \ + detindex=i; \ + } \ + else cout << "******************************** cannot parse detector id" << endl; \ + uscore=s.rfind("_"); \ if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"p%d",&i)) { \ p_index=i; \ s=fname.substr(0,uscore); \ @@ -235,11 +240,6 @@ class fileIOStatic { s=fname.substr(0,uscore); \ } \ else cout << "******************************** cannot parse scan varable 0" << endl; \ - uscore=s.rfind("_"); \ - if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"d%d",&i)) { \ - detindex=i; \ - } \ - else cout << "******************************** cannot parse detector id" << endl; \ return index; \ }; @@ -254,6 +254,9 @@ class fileIOStatic { double f; \ string s; \ s=fname; \ + uscore=s.rfind("_"); \ + if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"d%d",&i)) \ + s=fname.substr(0,uscore); \ size_t uscore=s.rfind("_"); \ if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"p%d",&i)) \ s=fname.substr(0,uscore); \ @@ -263,9 +266,6 @@ class fileIOStatic { uscore=s.rfind("_"); \ if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"S%lf",&f)) \ s=fname.substr(0,uscore); \ - uscore=s.rfind("_"); \ - if (sscanf( s.substr(uscore+1,s.size()-uscore-1).c_str(),"d%d",&i)) \ - s=fname.substr(0,uscore); \ return s; \ }; diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp index 73e7a3e7c..1620249be 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.cpp @@ -563,7 +563,7 @@ void* postProcessing::processData(int delflag) { #endif pthread_mutex_unlock(&mg); //go through once more to get last nth frame data - if (acquiringDone >= 4){ + if (acquiringDone >= 5){cout<<"acquiringdone:"<