Changeset 5144 for trunk/MagicSoft/Mars

Timestamp:

09/28/04 18:30:48 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mastro/MAstroCamera.cc (modified) (2 diffs)
• mbase/MDirIter.cc (modified) (1 diff)
• mbase/MDirIter.h (modified) (1 diff)
• mgeom/MGeomCam.cc (modified) (1 diff)
• mraw/MRawFileRead.cc (modified) (1 diff)
• msignal/MExtractSlidingWindow.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -84 +84 @@
    * msignal/MArrivalTime.cc:
      - fixed GetPixelContent
+
+   * mastro/MAstroCamera.cc:
+     - replaced "unknown" by "n/a"
+
+   * mbase/MDirIter.[h,cc]:
+     - added Sort function (not yet fully tested)
+
+   * mgeom/MGeomCam.cc:
+     - removed automatic setting of ReadyToSave in constructor
+       PLEASE contact me if you have trouble with this
+
+   * mraw/MRawFileRead.cc:
+     - SetReadyToSave for run-header after reading
+
+   * msignal/MExtractSlidingWindow.cc:
+     - fixed ReInit-output
 
 

trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

@@ -299 +299 @@
 // Otherwise a new object is created.
 //
+// FIXME: Add Project functionand change treating MHCamera and
+//        TH2D accordingly
+//
 void MAstroCamera::AddPrimitives(TString o)
 {
@@ -469 +472 @@
       // Do _not_ remove this, name needs to be 
       // transferred to the starpos.
-      TString name = radec->GetName();
-      if (name.Length()==0) {
-        starpos->SetName("unknown");
-      } else {
-        starpos->SetName(radec->GetName());
-      }
+      const TString name = radec->GetName();
+      starpos->SetName(name.IsNull() ? "n/a" : name.Data());
 
       const TVector3 spot = fMirror0->GetReflection(star, fGeom->GetCameraDist())*1000;

trunk/MagicSoft/Mars/mbase/MDirIter.cc

@@ -350 +350 @@
     }
 }
+
+// --------------------------------------------------------------------------
+//
+// Loop over all contents (files). Sort the files alphabetically.
+// Delete the contents of this DirIter and add all sorted files
+// to this DirIter.
+//
+void MDirIter::Sort()
+{
+    MDirIter Next(*this);
+
+    TList l;
+    l.SetOwner();
+
+    TString name;
+    while (!(name=Next()).IsNull())
+        l.Add(new TNamed(name.Data(), ""));
+
+    l.Sort();
+
+    fList.Delete();
+    Close();
+    fFilter = "";
+
+    TIter NextN(&l);
+    TObject *o=0;
+    while ((o=NextN()))
+           AddDirectory(o->GetName());
+}

trunk/MagicSoft/Mars/mbase/MDirIter.h

@@ -48 +48 @@
     }
 
+    void Sort();
+
     Int_t AddDirectory(const char *dir, const char *filter="", Int_t recursive=0);
     void  Add(const MDirIter &iter);

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -94 +94 @@
     for (UInt_t i=0; i<npix; i++)
         fPixels[i] = new MGeomPix;
-
-    SetReadyToSave();
 }
 

trunk/MagicSoft/Mars/mraw/MRawFileRead.cc

@@ -202 +202 @@
     fNumEvents += fRawRunHeader->GetNumEvents();
 
+    fRawRunHeader->SetReadyToSave();
+
     //
     // Give the run header information to the 'sub-classes'

trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.cc

@@ -17 +17 @@
 !
 !   Author(s): Thomas Bretz, 02/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
-!              Hendrik Bartko, 01/2004 <mailto:hbartko@mppmu.mpg.de>
-!              Markus Gaug   , 04/2004 <mailto:markus@ifae.es>
+!   Author(s): Hendrik Bartko, 01/2004 <mailto:hbartko@mppmu.mpg.de>
+!   Author(s): Markus Gaug, 04/2004 <mailto:markus@ifae.es>
 !
 !   Copyright: MAGIC Software Development, 2000-2004
@@ -130 +130 @@
 
 
-  *fLog << endl;
-  *fLog << inf << GetDescriptor() << ": Taking " << fNumHiGainSamples
-        << " HiGain samples from a window starting with slice " << (Int_t)fHiGainFirst
+  *fLog << dec << endl;
+  *fLog << inf << "Taking " << fNumHiGainSamples
+        << " HiGain samples starting with slice " << (Int_t)fHiGainFirst
         << " to " << (Int_t)(fHiGainLast+fHiLoLast) << " incl" << endl;
-  *fLog << inf << GetDescriptor() << ": Taking " << fNumLoGainSamples
-        << " LoGain samples from a window starting with slice " << (Int_t)fLoGainFirst
+  *fLog << inf << "Taking " << fNumLoGainSamples
+        << " LoGain samples starting with slice " << (Int_t)fLoGainFirst
         << " to " << (Int_t)fLoGainLast << " incl" << endl;