Changeset 9035 for trunk/MagicSoft/Mars

Timestamp:

07/22/08 19:13:52 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• BaseLinkDef.h (modified) (1 diff)
• MParContainer.h (modified) (2 diffs)
• MParEmulated.cc (added)
• MParEmulated.h (added)
• MParameters.h (modified) (2 diffs)
• Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -84 +84 @@
 #pragma link C++ class MParameterD+;
 #pragma link C++ class MParameterDerr+;
+#pragma link C++ class MParEmulated+;
 
 // Tool tasks

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -34 +34 @@
 class MParContainer : public TObject
 {
+    friend class MParEmulated;
 private:
     static TObjArray fgListMethodCall; //!
@@ -111 +112 @@
     virtual void StreamPrimitive(ostream &out) const;
 
-    TMethodCall *GetterMethod(const char *name) const;
+    virtual TMethodCall *GetterMethod(const char *name) const;
 
     Bool_t WriteDataMember(ostream &out, const char *member, Double_t scale=1) const;

trunk/MagicSoft/Mars/mbase/MParameters.h

@@ -18 +18 @@
 
     void Print(Option_t *o="") const;
+
+    Double_t *GetPtr() { return &fVal; }
 
     ClassDef(MParameterD, 1) // Container to hold a generalized parameters (double)
@@ -51 +53 @@
 
     void Print(Option_t *o="") const;
+
+    Int_t *GetPtr() { return &fVal; }
 
     ClassDef(MParameterI, 1) // Container to hold a generalized parameters (integer)

trunk/MagicSoft/Mars/mbase/Makefile

@@ -28 +28 @@
            MLogPlugin.cc \
            MLogHtml.cc \
+           MParList.cc \
            MParContainer.cc \
-           MParList.cc \
+           MParEmulated.cc \
+           MParameters.cc \
            MInputStreamID.cc \
            MTask.cc \
@@ -49 +51 @@
            MStatusArray.cc \
            MStatusDisplay.cc \
-           MParameters.cc \
            MArray.cc \
            MArrayB.cc \