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

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