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

changed everything back

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@211 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
ramani_n 2012-08-03 09:13:48 +00:00
parent 268711f6a6
commit afbf7c9166
7 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -17,7 +17,7 @@ ID: $Id$
class slsDetector; class slsDetector;
#include "sls_detector_defs.h" //#include "sls_detector_defs.h"
@ -36,8 +36,9 @@ class slsDetector;
*/ */
class multiSlsDetector : public virtual slsDetectorUtils { class multiSlsDetector : public slsDetectorUtils {
//public virtual slsDetectorUtils {
typedef struct sharedMultiSlsDetector { typedef struct sharedMultiSlsDetector {

6
slsDetectorSoftware/slsDetector/slsDetectorActions.cpp
View File

@ -404,9 +404,7 @@ int slsDetectorActions::getScanPrecision(int iscan){
int slsDetectorActions::executeScan(int level, int istep) { int slsDetectorActions::executeScan(int level, int istep) {
int trimbit;
int trimbit,aMask,prec0,prec1,pindex,npos;
float sv0,sv1;
char cmd[MAX_STR_LENGTH]; char cmd[MAX_STR_LENGTH];
if (level<0 || level>MAX_SCAN_LEVELS) if (level<0 || level>MAX_SCAN_LEVELS)
@ -431,7 +429,7 @@ int slsDetectorActions::executeScan(int level, int istep) {
break; break;
default: default:
//Custom scan script level 1. The arguments are passed as nrun=n fn=filename var=v par=p" //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(level).c_str(),getFileIndex(),createFileName(aMask,sv0,prec0,sv1,prec1,pindex,npos).c_str(),currentScanVariable[level],getScanParameter(level).c_str()); sprintf(cmd,"%s nrun=%d fn=%s var=%f par=%s",getScanScript(level).c_str(),getFileIndex(),createFileName().c_str(),currentScanVariable[level],getScanParameter(level).c_str());
#ifdef VERBOSE #ifdef VERBOSE
cout << "Executing scan script "<< level << " " << cmd << endl; cout << "Executing scan script "<< level << " " << cmd << endl;
#endif #endif

4
slsDetectorSoftware/slsDetector/slsDetectorBase.h
View File

@ -64,7 +64,7 @@ using namespace std;
*/ */
//public virtual slsDetectorUsers, //public virtual slsDetectorUsers,
class slsDetectorBase : public virtual slsDetectorUsers , public virtual slsDetectorDefs { class slsDetectorBase : public slsDetectorUsers , public virtual slsDetectorDefs {
public: public:
@ -229,7 +229,7 @@ class slsDetectorBase : public virtual slsDetectorUsers , public virtual slsDet
/** generates file name without extension */ /** generates file name without extension */
virtual string createFileName(int aMask, double sv0, int prec0, double sv1, int prec1, int pindex, int npos)=0; virtual string createFileName()=0;

1
slsDetectorSoftware/slsDetector/slsDetectorCommand.h
View File

@ -151,7 +151,6 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
string cmdImage(int narg, char *args[], int action); string cmdImage(int narg, char *args[], int action);
string cmdCounter(int narg, char *args[], int action); string cmdCounter(int narg, char *args[], int action);
string cmdADC(int narg, char *args[], int action); string cmdADC(int narg, char *args[], int action);
//string helpADC(int narg, char *args[], int action);
string cmdEnablefwrite(int narg, char *args[], int action); string cmdEnablefwrite(int narg, char *args[], int action);

1
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -33,6 +33,7 @@ extern "C" {
using namespace std; using namespace std;
//#include "slsDetectorActions_Standalone.h"
#include "slsDetectorActions.h" #include "slsDetectorActions.h"
#include "postProcessing.h" #include "postProcessing.h"

5
slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h
View File

@ -32,10 +32,9 @@ using namespace std;
(including thread for writing data files and plotting in parallel with the acquisition) (including thread for writing data files and plotting in parallel with the acquisition)
*/ */
class postProcessing : public virtual angularConversion, public virtual fileIO { class postProcessing : public angularConversion, public fileIO {
//public virtual angularConversion, public virtual fileIO {
//: public angularConversion, public fileIO
public: public:
postProcessing(); postProcessing();

4
slsDetectorSoftware/slsDetectorAnalysis/postProcessingFileIO_Standalone.h
View File

@ -4,7 +4,7 @@
#include "detectorData.h" #include "detectorData.h"
#include "sls_detector_defs.h" #include "sls_detector_defs.h"
#include "slsDetectorBase.h" #include "slsDetectorBase_Standalone.h"
#include "slsDetectorUsers.h" #include "slsDetectorUsers.h"
#include "FileIO_Standalone.h" #include "FileIO_Standalone.h"
#include "AngularConversion_Standalone.h" #include "AngularConversion_Standalone.h"
@ -39,7 +39,7 @@ using namespace std;
(including thread for writing data files and plotting in parallel with the acquisition) (including thread for writing data files and plotting in parallel with the acquisition)
*/ */
class postProcessing : public virtual slsDetectorBase { class postProcessing : public virtual slsDetectorBase1 {
//: public angularConversion, public fileIO //: public angularConversion, public fileIO