Changeset 7438 for trunk/MagicSoft/Mars

Timestamp:

12/01/05 16:43:46 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/BaseLinkDef.h (modified) (1 diff)
• mbase/MDirIter.cc (modified) (1 diff)
• mbase/MLog.cc (modified) (4 diffs)
• mbase/MLog.h (modified) (2 diffs)
• mbase/MStatusDisplay.cc (modified) (3 diffs)
• mbase/MZlib.cc (added)
• mbase/MZlib.h (added)
• mbase/Makefile (modified) (1 diff)
• mgui/MCamEvent.cc (modified) (2 diffs)
• mgui/MCamEvent.h (modified) (2 diffs)
• mimage/MHillas.cc (modified) (2 diffs)
• mjobs/MJCalibrateSignal.cc (modified) (1 diff)
• mjobs/MSequence.cc (modified) (1 diff)
• mraw/MRawFileRead.cc (modified) (5 diffs)
• mraw/MRawFileRead.h (modified) (2 diffs)
• readdaq.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
- 2005/11/30 Thomas Bretz
-
-   * showplot.cc:
-     - fixed some warnings
+ 2005/12/01 Thomas Bretz
+
+   * readdaq.cc:
+     - allow different file names
+
+   * mbase/MLog.[h,cc]:
+     - replaced preprocessor directive by const data member
+
+   * mbase/MDirIter.cc:
+     - removed special treatment of ?-character
+
+   * mbase/Makefile, mbase/BaseLinkDef.h:
+     - added new class
+
+   * mimage/MHillas.cc:
+     - changed atan2-output in Print to same convention as used
+       in MGeomCam
+
+   * mjobs/MJCalibrateSignal.cc:
+     - modified replacement rule for output file names
+
+   * mbase/MStatusDisplay.cc:
+     - fixed initial size
+     - automatically call SetFrameBorderMode for each new canvas
+
+   * mjobs/MSequence.cc:
+     - updated rule used to build file names
 
    * mgui/MCamEvent.[h,cc]:
      - implemented new member function GetCameraRMS
      - implemented new member function GetCameraStat
+
+   * mraw/MRawFileRead.[h,cc]:
+     - implemented new I/O scheme
+
+
+
+ 2005/11/30 Thomas Bretz
+
+   * showplot.cc:
+     - fixed some warnings
 
    * mmc/MMcFadcHeader.[hxx,cxx]:
@@ -35 +68 @@
    * mmc/Makefile:
      - added mgui 
-
-   * mbase/MStatusDisplay.cc:
-     - fixed initial size
-     - automatically call SetFrameBorderMode for each new canvas
 
    * datacenter/macros/plotdb.C:

trunk/MagicSoft/Mars/mbase/BaseLinkDef.h

@@ -15 +15 @@
 #pragma link C++ class MLogPlugin+;
 #pragma link C++ class MLogHtml+;
+
+// I/O
+#pragma link C++ class MZlib+;
 
 // Basic Network Tools

trunk/MagicSoft/Mars/mbase/MDirIter.cc

@@ -223 +223 @@
     n.ReplaceAll("+", "\\+");
     n.ReplaceAll("*", "[^\\/:]*");
-    n.ReplaceAll("?", ".");
     n.Append("$");
 

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -173 +173 @@
 // which is used for the output (i)
 //
-MLog::MLog(int i) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(i), fIsNull(kFALSE), fOut(NULL), fOutAllocated(kFALSE), fGui(NULL), fNumLines(0)
+MLog::MLog(int i) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(i), fIsNull(kFALSE), fOut(NULL), fOutAllocated(kFALSE), fGui(NULL), fNumLines(0)
 {
     Init();
@@ -183 +183 @@
 // ofstream as the default output device
 //
-MLog::MLog(ofstream &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fOut(&out), fOutAllocated(kFALSE), fGui(NULL), fNumLines(0)
+MLog::MLog(ofstream &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fOut(&out), fOutAllocated(kFALSE), fGui(NULL), fNumLines(0)
 {
     Init();
@@ -193 +193 @@
 // TGTextView as the default output device
 //
-MLog::MLog(TGTextView &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fOut(NULL), fOutAllocated(kFALSE), fGui(&out), fNumLines(0)
+MLog::MLog(TGTextView &out) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eGui), fOut(NULL), fOutAllocated(kFALSE), fGui(&out), fNumLines(0)
 {
     Init();
@@ -204 +204 @@
 // or not.
 //
-MLog::MLog(const char *fname, int flag) : ostream(this), fPPtr(fBase), fEPtr(fBase+bsz), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fGui(NULL), fNumLines(0)
+MLog::MLog(const char *fname, int flag) : ostream(this), fPPtr(fBase), fEPtr(fBase+fgBufferSize), fOutputLevel(0), fDebugLevel((unsigned)-1), fDevice(eFile), fIsNull(kFALSE), fGui(NULL), fNumLines(0)
 {
     Init();

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -13 +13 @@
 #include <iostream>  // base classes for MLog
 
-#define bsz    160 // two standard lines
 
 class MArgs;
@@ -54 +53 @@
     static const char *const kDark;
 
+    static const int fgBufferSize = 160;  // two standard lines
+
     char        fBuffer;      //!
-    char        fBase[bsz+1]; //! Buffer to store the data in
+    char        fBase[fgBufferSize+1]; //! Buffer to store the data in
     char       *fPPtr;        //! Pointer to present position in buffer
     const char *fEPtr;        //! Pointer to end of buffer

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -722 +722 @@
     // set the smallest and biggest size of the Main frame
     // and move it to its appearance position
-    SetWMSizeHints(571, 480, 2048, 1536, 1, 1);
-    MoveResize(rand()%100+571, rand()%100+480, 570, 480);
+    SetWMSizeHints(572, 480, 2048, 1536, 1, 1);
+    MoveResize(rand()%100+572, rand()%100+480, 572, 480);
 
     //
@@ -998 +998 @@
 
     c.SetFillColor(16/*165*//*17*//*203*/);
+    c.SetFrameBorderMode(0);
     c.SetBorderMode(0);
 
@@ -1589 +1590 @@
 
     case kSize640:  
-        Resize(571, 480);
+        Resize(572, 480);
         return kTRUE;
     case kSize768:  

trunk/MagicSoft/Mars/mbase/Makefile

@@ -59 +59 @@
            MClone.cc \
            MContinue.cc \
-           MPrint.cc
+           MPrint.cc \
+           MZlib.cc
 
 ############################################################

trunk/MagicSoft/Mars/mgui/MCamEvent.cc

@@ -62 +62 @@
 Double_t MCamEvent::GetCameraMean(const MGeomCam &cam, Int_t type) const
 {
+    return GetCameraStat(cam, type)[0];
+    /*
     Int_t    num  = 0;
     Double_t mean = 0;
@@ -74 +76 @@
     }
     return num == 0 ? 0 : mean/num;
+    */
 }
+
+// --------------------------------------------------------------------------
+//
+// Return the rms of all corresponding GetPixelContent
+//
+Double_t MCamEvent::GetCameraRMS(const MGeomCam &cam, Int_t type) const
+{
+    return GetCameraStat(cam, type)[1];
+    /*
+    Int_t    num  = 0;
+    Double_t sum = 0;
+    Double_t sq  = 0;
+
+    for (unsigned int i=0; i<cam.GetNumPixels(); i++)
+    {
+        Double_t val;
+        if (!GetPixelContent(val, i, cam, type))
+            continue;
+
+        sum += val;
+        sq  += val;
+        num ++;
+    }
+
+    if (num==0)
+        return 0;
+
+    sum /= num;
+    sq  /= num;
+
+    return TMath::Sqrt(sq-sum*sum);
+    */
+}
+
+// --------------------------------------------------------------------------
+//
+// Return the rms of all corresponding GetPixelContent
+//
+TArrayD MCamEvent::GetCameraStat(const MGeomCam &cam, Int_t type) const
+{
+    Int_t    num = 0;
+    Double_t sum = 0;
+    Double_t sq  = 0;
+
+    for (unsigned int i=0; i<cam.GetNumPixels(); i++)
+    {
+        Double_t val;
+        if (!GetPixelContent(val, i, cam, type))
+            continue;
+
+        sum += val;
+        sq  += val;
+        num ++;
+    }
+
+    if (num==0)
+        return 0;
+
+    sum /= num;
+    sq  /= num;
+
+    TArrayD stat(2);
+    stat[0] = sum;
+    stat[1] = TMath::Sqrt(sq-sum*sum);
+    return stat;
+}

trunk/MagicSoft/Mars/mgui/MCamEvent.h

@@ -2 +2 @@
 #define MARS_MCamEvent
 
-#ifndef ROOT_TROOT
-#include <TROOT.h>
+#ifndef ROOT_TArrayD
+#include <TArrayD.h>
 #endif
 
@@ -18 +18 @@
 
     virtual Double_t GetCameraMean(const MGeomCam &cam, Int_t type=0) const;
+    virtual Double_t GetCameraRMS(const MGeomCam &cam, Int_t type=0) const;
+    virtual TArrayD  GetCameraStat(const MGeomCam &cam, Int_t type=0) const;
 
     ClassDef(MCamEvent, 0) // A camera event

trunk/MagicSoft/Mars/mimage/MHillas.cc

@@ -159 +159 @@
 void MHillas::Print(Option_t *) const
 {
-    Double_t atg = atan2(fMeanY, fMeanX)*kRad2Deg;
-
-    if (atg<0)
-        atg += 180;
+    const Double_t atg = atan2(fMeanX, fMeanY)*kRad2Deg;
 
     *fLog << all;
@@ -182 +179 @@
 void MHillas::Print(const MGeomCam &geom) const
 {
-    Double_t atg = atan2(fMeanY, fMeanX)*kRad2Deg;
-
-    if (atg<0)
-        atg += 180;
+    const Double_t atg = atan2(fMeanX, fMeanY)*kRad2Deg;
 
     *fLog << all;

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -403 +403 @@
     read->AddFiles(iter);
 
-    const TString fname(Form("%s{s/_D_/_Y_}{s/.raw$/.root}", fPathOut.Data()));
+    const TString fname(Form("%s{s/_D_/_Y_}{s/\\.raw$/\\.root}{s/\\.raw\\.gz$/.root}", fPathOut.Data()));
 
     

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -279 +279 @@
         case kRawCal:
         case kRawAll:
-            n += ".raw";
+            n += ".raw.?g?z?";
             break;
         default:

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -44 +44 @@
 
 #include <errno.h>
-#include <fstream>
 
 #include <TSystem.h>
@@ -51 +50 @@
 #include "MLogManip.h"
 
+#include "MZlib.h"
 #include "MTime.h"
 #include "MParList.h"
@@ -127 +127 @@
 Byte_t MRawFileRead::IsFileValid(const char *name)
 {
-    ifstream fin(name);
+    MZlib fin(name);
     if (!fin)
         return 0;
@@ -188 +188 @@
 
     const char *expname = gSystem->ExpandPathName(name);
-    fIn = new ifstream(expname);
+    fIn = new MZlib(expname);
 
     const Bool_t noexist = !(*fIn);
@@ -194 +194 @@
     {
         *fLog << err << "Cannot open file " << expname << ": ";
-        *fLog << strerror(errno) << endl;
+        *fLog << (errno==0?strerror(errno):"Insufficient memory for decompression") << endl;
     }
     else

trunk/MagicSoft/Mars/mraw/MRawFileRead.h

@@ -7 +7 @@
 
 class TList;
+class MZlib;
 class MTaskList;
 
@@ -12 +13 @@
 {
 private:
-    TList     *fFileNames;      // list of file names
-    UInt_t     fNumFile;        //! number of next file
-    UInt_t     fNumEvents;      //! input stream (file to read from)
-    UInt_t     fNumTotalEvents; //! total number of events in all files
+    TList    *fFileNames;      // list of file names
+    UInt_t    fNumFile;        //! number of next file
+    UInt_t    fNumEvents;      //! input stream (file to read from)
+    UInt_t    fNumTotalEvents; //! total number of events in all files
 
-    ifstream  *fIn;             //! input stream (file to read from)
+    MZlib    *fIn;             //! input stream (file to read from)
 
-    MParList  *fParList;        //! tasklist to call ReInit from
+    MParList *fParList;        //! tasklist to call ReInit from
 
-    UInt_t     fInterleave;
+    UInt_t    fInterleave;
 
     Int_t  OpenNextFile(Bool_t print=kTRUE);

trunk/MagicSoft/Mars/readdaq.cc

@@ -92 +92 @@
     TString kNamein = arg.GetArgumentStr(0);
   
-    if (!kNamein.EndsWith(".raw"))
+    if (!kNamein.EndsWith(".raw") && !kNamein.EndsWith(".raw.gz"))
         kNamein += ".raw";