Changeset 3018 for trunk/MagicSoft/Mars

Timestamp:

02/04/04 16:24:10 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• manalysis/MExtractSignal2.cc (modified) (1 diff)
• mfilter/MFilterList.cc (modified) (1 diff)
• mmain/MBrowser.cc (modified) (1 diff)
• mraw/MRawEvtPixelIter.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -5 +5 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/02/04: Thomas Bretz
+ 
+   * manalysis/MExtractSignal2.cc:
+     - don't allow odd numbers for the window size
+
+   * mfilter/MFilterList.cc:
+     - corrected a wrong logging message
+
+   * mmain/MBrowser.cc:
+     - added '/data/MAGIC' as shortcut in the combo box
+     
+   * mraw/MRawEvtPixelIter.cc:
+     - optimized calculation of MaxIdx
+
+
+
  2004/02/03: Abelardo Moralejo
 
@@ -10 +26 @@
     - removed unnecessary variables BinsHigh, BinsLow
 
+
+
  2004/02/03: Markus Gaug
 
-  * manalysis/MPedestalCam.[h,cc]
-  * manalysis/MPedestalPix.[h,cc]
-  * manalysis/MPedCalcPedRun.[h,cc]
-  * manalysis/MHPedestalPixel.[h,cc]
-  * macros/calibration.C
+  * manalysis/MPedestalCam.[h,cc], manalysis/MPedestalPix.[h,cc],
+    manalysis/MPedCalcPedRun.[h,cc], manalysis/MHPedestalPixel.[h,cc],
+    macros/calibration.C:
     - histograms are now filled with MFillH as proposed and coded by 
       Thomas Bretz. Some modifications had to be done, however. 
@@ -34 +50 @@
        remove MHPedestalPixel
 
-   * manalysis/MCalibrationPix.[h,cc]
-   * manalysis/MHCalibrationPixel.[h,cc]
-   * manalysis/MCalibrationCam.cc
-   * macros/calibration.C
+   * manalysis/MCalibrationPix.[h,cc], manalysis/MHCalibrationPixel.[h,cc],
+     manalysis/MCalibrationCam.cc, macros/calibration.C:
      - now split completely absolute and relative times. Absolute 
        times are not fitted, but their histogram mean and rms are 
        returned.
+
 
 

trunk/MagicSoft/Mars/manalysis/MExtractSignal2.cc

@@ -85 +85 @@
     fLoGainFirst = first;
 
-    fWindow = window;
-
+    fWindow     = window & ~1;
     fWindowSqrt = TMath::Sqrt((Float_t)fWindow);
+
+    if (fWindow==window)
+        return;
+
+    *fLog << warn << "MExtractSignal2::SetRange - Window size set to even " << fWindow << endl;
 }
 

trunk/MagicSoft/Mars/mfilter/MFilterList.cc

@@ -188 +188 @@
 
     if (fFilters.FindObject(name))
-        *fLog << warn << dbginf << "'" << name << "' exists in List already... skipped." << endl;
+        *fLog << warn << "MFilterList::AddToList - '" << name << "' exists in List already..." << endl;
 
     *fLog << inf << "Adding " << name << " to " << GetName() << "... " << flush;

trunk/MagicSoft/Mars/mmain/MBrowser.cc

@@ -136 +136 @@
     frame->AddFrame(dir, laydir);
 
+    const TGPicture *pic0 = fList->GetPicture("magic_t.xpm");
+    TGTReeLBEntry *entry = new TGTreeLBEntry(dir->GetListBox()->GetContainer(),
+                                             new TGString("/data/MAGIC"), pic0, 6000,
+                                             new TGString("/data/MAGIC"));
+    TGLayoutHints *laylb = new TGLayoutHints(kLHintsLeft|kLHintsTop, 14, 0, 0, 0);
+    dir->AddEntry(entry, laylb);
+    fList->Add(laylb);
+    fList->Add(entry);
+
     //
     // Get the three picturs from the system (must be deleted by FreePicture)

trunk/MagicSoft/Mars/mraw/MRawEvtPixelIter.cc

@@ -217 +217 @@
 Byte_t MRawEvtPixelIter::GetIdxMaxHiGainSample() const
 {
-    Byte_t max  = 0;
-    Byte_t maxi = 0;
-
-    for (int i=0; i<fNumHiGainSamples; i++)
-        if (fHiGainPos[i]>max)
-        {
-            max = fHiGainPos[i];
-            maxi = i;
-        }
-
-    return maxi;
+    Byte_t *ptr = fHiGainPos+1;
+    Byte_t *max = fHiGainPos;
+    const Byte_t *end = ptr + fNumHiGainSamples;
+
+    do if (*ptr>*max) max = ptr;
+    while (++ptr != end);
+
+    return max-fHiGainPos;
 }
 
@@ -241 +238 @@
         return -1; // means: not found
 
-    Byte_t max  = 0;
-    Byte_t maxi = 0;
-
-    for (int i=fNumLoGainSamples-1; i>=0; i--)
-        if (fLoGainPos[i]>max)
-        {
-            max = fLoGainPos[i];
-            maxi = i;
-        }
-
-    return maxi;
+    Byte_t *ptr = fLoGainPos+1;
+    Byte_t *max = fLoGainPos;
+    const Byte_t *end = ptr + fNumLoGainSamples;
+
+    do if (*ptr>*max) max = ptr;
+    while (++ptr != end);
+
+    return max-fLoGainPos;
 }