Changeset 1219

Timestamp:

02/21/02 12:12:37 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/NEWS (modified) (1 diff)
• Mars/mbase/MWriteAsciiFile.cc (modified) (1 diff)
• Mars/mbase/MWriteAsciiFile.h (modified) (2 diffs)
• Mars/mgui/MCamDisplay.cc (modified) (1 diff)
• Mars/mhist/MHAlphaEnergyTheta.cc (modified) (1 diff)
• include-Classes/MMcFormat/MMcEvt.cxx (modified) (2 diffs)
• include-Classes/MMcFormat/MMcEvt.hxx (modified) (1 diff)

trunk/MagicSoft/Mars/NEWS

@@ -21 +21 @@
    - Added a filter for the alpha parameter (MFilter)
 
+   - it is now possible to write single data members of a class object to
+     an output stream instead of the whole container only
  
  

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -38 +38 @@
 // AddContainer.                                                           //
 //                                                                         //
+// You can also write single data members of a container (like fWidth      //
+// of MHillas). For more details see AddContainer. Make sure, that a       //
+// getter method for the data member exist. The name of the method         //
+// must be the same than the data member itself, but the f must be         //
+// replaced by a Get.                                                      //
+//                                                                         //
 /////////////////////////////////////////////////////////////////////////////
 

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.h

@@ -16 +16 @@
     TObjArray fContNames;
     TObjArray fContainer;
+    TObjArray fMembers;
 
     TString fNameFile;
@@ -33 +34 @@
     ~MWriteAsciiFile();
 
-    void AddContainer(const char *cname);
-    void AddContainer(MParContainer *cont);
+    void AddContainer(const char *cname, const char *member="");
+    void AddContainer(MParContainer *cont, const char *member="");
 
     ClassDef(MWriteAsciiFile, 0) // Class to write one container to an ascii file

trunk/MagicSoft/Mars/mgui/MCamDisplay.cc

@@ -93 +93 @@
     // Fixme: Divide pnum by the (real) area of the pixel
     //
-
     const Float_t ratio = (*fGeomCam)[0].GetA()/(*fGeomCam)[i].GetA();
     const Float_t pnum  = ratio*pix.GetNumPhotons();

trunk/MagicSoft/Mars/mhist/MHAlphaEnergyTheta.cc

@@ -188 +188 @@
     // FIXME: ROOT Binning??? of projection
     // root 3.02: SetRangeUser
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)
     axe.SetRange(axe.FindFixBin(lo), axe.FindFixBin(up));
+#else
+    axe.SetRangeUser(lo, up);
+#endif
 }
 

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.cxx

@@ -162 +162 @@
 }
 
-
+/*
 void MMcEvt::AsciiWrite(ofstream &fout) const
 {
@@ -168 +168 @@
     fout << fTheta ;
 }
+*/
 
 void MMcEvt::Print(Option_t *Option) const {

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx

@@ -43 +43 @@
              UInt_t, UInt_t, UInt_t, UInt_t, UInt_t, UInt_t ) ; 
 
-  virtual void AsciiWrite(ofstream &fout) const;
+  //virtual void AsciiWrite(ofstream &fout) const;
 
   void Print(Option_t *opt=NULL) const;