reshuffling by Anna

git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@179 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
bergamaschi
2012-05-14 13:39:18 +00:00
parent b484ad7f20
commit b5e966bb58
19 changed files with 528 additions and 631 deletions

View File

@ -3,7 +3,7 @@
#include "postProcessing.h"
#include "slsDetectorBase.h"
#include <string>
#include <fstream>
@ -20,7 +20,9 @@ using namespace std;
*/
class slsDetectorActions : public postProcessing {
class slsDetectorActions : public virtual slsDetectorBase
// : public virtual postProcessing
{
public :
/** default constructor */
slsDetectorActions(){};