changed everything back

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

View File

@ -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