Changeset 3959

Timestamp:

05/04/04 16:45:45 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mastro/MAstroCatalog.h (modified) (2 diffs)
• msignal/MExtractFixedWindow.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -60 +60 @@
      - put one initialization to 0 into the MExtractor
 
-
+   * mastro/MAstroCatalog.h
+     - make AlignCoordinates() protected, in order to compile
+ 
  2004/05/03: Thomas Bretz
 

trunk/MagicSoft/Mars/mastro/MAstroCatalog.h

@@ -91 +91 @@
     Bool_t    DrawLine(const TVector2 &v0, Double_t dx, Double_t dy, const TRotation &rot, Int_t type);
     void      DrawGrid(const TVector3 &v0, const TRotation &rot, Int_t type);
-    TRotation AlignCoordinates(const TVector3 &v) const;
     void      Paint(Option_t *o="");
     Int_t     DistancetoPrimitive(Int_t px, Int_t py);
@@ -137 +136 @@
     MTime        *fTime;        // Possible observation time
 
+    TRotation AlignCoordinates(const TVector3 &v) const;
     virtual TString GetPadTitle() const;
     TRotation GetGrid(Bool_t local);

trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.cc

@@ -175 +175 @@
   Byte_t *end = ptr + fHiGainLast - fHiGainFirst + 1;
   
-  sum = 0;
-  sat = 0;
-  
   while (ptr<end)
     {
@@ -207 +204 @@
 // - Sum up contents of *ptr
 // - If *ptr is greater than fSaturationLimit, raise sat by 1
+// - If fHiLoLast is set, loop from logain to (logain+fHiLoLast)
+// - Add contents of *logain to sum
 // 
 void MExtractFixedWindow::FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
@@ -212 +211 @@
 
   Byte_t *end = ptr + fLoGainLast - fLoGainFirst + 1;
-  
-  sum = 0;
-  sat = 0;
   
   while (ptr<end)