Changeset 19273

Timestamp:

10/22/18 21:40:28 (6 years ago)

Author:

tbretz

Message:

A lot of code became obsolete with root 6.

Location:

trunk/Mars/mbase

Files:

• MTaskInteractive.cc (modified) (7 diffs)
• MTaskInteractive.h (modified) (5 diffs)

trunk/Mars/mbase/MTaskInteractive.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz, 6/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Thomas Bretz, 6/2003 <mailto:tbretz@physik.rwth-aachen.de>
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2018
 !
 !
@@ -62 +62 @@
 #if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
 #include <Api.h>
+#include <TMethodCall.h>
 #endif
-#include <TMethodCall.h>
 
 #include "MLog.h"
@@ -82 +82 @@
     fTitle = title ? title : "Interactive task";
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
     fCall[0] = 0;
     fCall[1] = 0;
     fCall[2] = 0;
     fCall[3] = 0;
+#endif
 }
 
@@ -100 +102 @@
 }
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
 // --------------------------------------------------------------------------
 //
@@ -128 +131 @@
 Bool_t MTaskInteractive::Set(void *fcn, Int_t no, const char *params)
 {
-#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
     // this function is called by CINT instead of the function above
     if (!fcn)
@@ -162 +164 @@
 
     return kTRUE;
-#else
-    gLog << err << "MTaskInteractive::Set not yet supported for root 6." << endl;
-    return kFALSE;
-#endif
 }
 
@@ -179 +177 @@
     fCall[no] = 0;
 }
+#endif

trunk/Mars/mbase/MTaskInteractive.h

@@ -12 +12 @@
 {
 private:
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
     TMethodCall *fCall[4];
+#endif
 
     Int_t  (*fPreProcess)(MParList *list);
@@ -19 +21 @@
     Bool_t (*fReInit)(MParList *list);
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
     Int_t  PreProcess(MParList *list) { if (fCall[0]) return Return(0, &list); return fPreProcess  ? (*fPreProcess)(list) : kTRUE; }
     Int_t  Process()                  { if (fCall[1]) return Return(1);        return fProcess     ? (*fProcess)()        : kTRUE; }
@@ -24 +27 @@
     Bool_t ReInit(MParList *list)     { if (fCall[3]) return Return(3, &list); return fReInit      ? (*fReInit)(list)     : kTRUE; }
 
-    Int_t Return(Int_t no, void *param=NULL);
+    Int_t  Return(Int_t no, void *param=NULL);
     Bool_t Set(void *fcn, Int_t no, const char *params);
     void   Free(Int_t no);
+#else
+    Int_t  PreProcess(MParList *list) { return fPreProcess  ? (*fPreProcess)(list) : kTRUE; }
+    Int_t  Process()                  { return fProcess     ? (*fProcess)()        : kTRUE; }
+    Int_t  PostProcess()              { return fPostProcess ? (*fPostProcess)()    : kTRUE; }
+    Bool_t ReInit(MParList *list)     { return fReInit      ? (*fReInit)(list)     : kTRUE; }
+
+    void   Free(Int_t) { }
+#endif
 
 public:
@@ -38 +49 @@
     void SetReInit(Bool_t (*func)(MParList *list))    { fReInit      = func; Free(3); }
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,00,00)
     // This is for usage in CINT
     void SetPreProcess(void *fcn)  { Set(fcn, 0, "MParList*"); fPreProcess =0; }
@@ -43 +55 @@
     void SetPostProcess(void *fcn) { Set(fcn, 2, "");          fPostProcess=0; }
     void SetReInit(void *fcn)      { Set(fcn, 3, "MParList*"); fReInit     =0; }
+#endif
 
     ClassDef(MTaskInteractive, 0) // Interactive task