slsDetectorCommand does not inherit slsDetectorBase but rather uses its methods

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@132 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-02-24 15:32:39 +00:00
parent c2a24e2c73
commit 1064bd21ff
7 changed files with 395 additions and 965 deletions

View File

@ -24,8 +24,8 @@ using namespace std;
#include "sls_detector_defs.h"
#include "slsDetectorCommand.h"
//#include "slsDetectorBase.h"
//#include "slsDetectorCommand.h"
#include "slsDetectorBase.h"
#define MAX_TIMERS 10
#define MAX_ROIS 100
@ -79,7 +79,7 @@ class detectorData {
class slsDetectorUtils : public slsDetectorCommand {
class slsDetectorUtils : public slsDetectorBase {