From afbf7c9166e7687eba6c33625bfd7a878a02c1e2 Mon Sep 17 00:00:00 2001 From: ramani_n Date: Fri, 3 Aug 2012 09:13:48 +0000 Subject: [PATCH] changed everything back git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@211 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h | 5 +++-- slsDetectorSoftware/slsDetector/slsDetectorActions.cpp | 6 ++---- slsDetectorSoftware/slsDetector/slsDetectorBase.h | 4 ++-- slsDetectorSoftware/slsDetector/slsDetectorCommand.h | 1 - slsDetectorSoftware/slsDetector/slsDetectorUtils.h | 1 + slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h | 5 ++--- .../slsDetectorAnalysis/postProcessingFileIO_Standalone.h | 4 ++-- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h index 456df9ab9..8add496f6 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h @@ -17,7 +17,7 @@ ID: $Id$ 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 { diff --git a/slsDetectorSoftware/slsDetector/slsDetectorActions.cpp b/slsDetectorSoftware/slsDetector/slsDetectorActions.cpp index 18b822702..ce942cd58 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorActions.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorActions.cpp @@ -404,9 +404,7 @@ int slsDetectorActions::getScanPrecision(int iscan){ int slsDetectorActions::executeScan(int level, int istep) { - - int trimbit,aMask,prec0,prec1,pindex,npos; - float sv0,sv1; + int trimbit; char cmd[MAX_STR_LENGTH]; if (level<0 || level>MAX_SCAN_LEVELS) @@ -431,7 +429,7 @@ int slsDetectorActions::executeScan(int level, int istep) { 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(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 cout << "Executing scan script "<< level << " " << cmd << endl; #endif diff --git a/slsDetectorSoftware/slsDetector/slsDetectorBase.h b/slsDetectorSoftware/slsDetector/slsDetectorBase.h index c750d515d..0a7150ff2 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorBase.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorBase.h @@ -64,7 +64,7 @@ using namespace std; */ //public virtual slsDetectorUsers, -class slsDetectorBase : public virtual slsDetectorUsers , public virtual slsDetectorDefs { +class slsDetectorBase : public slsDetectorUsers , public virtual slsDetectorDefs { public: @@ -229,7 +229,7 @@ class slsDetectorBase : public virtual slsDetectorUsers , public virtual slsDet /** 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; diff --git a/slsDetectorSoftware/slsDetector/slsDetectorCommand.h b/slsDetectorSoftware/slsDetector/slsDetectorCommand.h index 6cc98a801..df3d4c598 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorCommand.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorCommand.h @@ -151,7 +151,6 @@ class slsDetectorCommand : public virtual slsDetectorDefs { string cmdImage(int narg, char *args[], int action); string cmdCounter(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); diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h index e58cbc375..0f4fa035c 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h @@ -33,6 +33,7 @@ extern "C" { using namespace std; +//#include "slsDetectorActions_Standalone.h" #include "slsDetectorActions.h" #include "postProcessing.h" diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h index c7a0d4706..89c2d99b0 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessing.h @@ -32,10 +32,9 @@ using namespace std; (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 angularConversion, public fileIO +//public virtual angularConversion, public virtual fileIO { public: postProcessing(); diff --git a/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFileIO_Standalone.h b/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFileIO_Standalone.h index 451b5ccbc..51e19a7df 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFileIO_Standalone.h +++ b/slsDetectorSoftware/slsDetectorAnalysis/postProcessingFileIO_Standalone.h @@ -4,7 +4,7 @@ #include "detectorData.h" #include "sls_detector_defs.h" -#include "slsDetectorBase.h" +#include "slsDetectorBase_Standalone.h" #include "slsDetectorUsers.h" #include "FileIO_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) */ -class postProcessing : public virtual slsDetectorBase { +class postProcessing : public virtual slsDetectorBase1 { //: public angularConversion, public fileIO