Changeset 6229 for trunk/MagicSoft/Mars

Timestamp:

02/03/05 10:42:15 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto.cc (modified) (1 diff)
• mjobs/MJCalibTest.cc (modified) (1 diff)
• msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/callisto.cc

@@ -391 +391 @@
             if (!job4.ProcessFile(job1.GetPedestalCam()))
               {
-                gLog << err << "Calculation of calibration failed." << endl << endl;
+                gLog << err << "Calibration of calibration failed." << endl << endl;
                 return -1;
               }

trunk/MagicSoft/Mars/mjobs/MJCalibTest.cc

@@ -352 +352 @@
   if (fSequence.IsValid())
     {
-      const Int_t n0 = fSequence.SetupDatRuns(iter, fPathData, "D", IsUseRawData());
-      const Int_t n1 = fSequence.GetNumDatRuns();
+      const Int_t n0 = fSequence.SetupCalRuns(iter, fPathData, "C", IsUseRawData());
+      const Int_t n1 = fSequence.GetNumCalRuns();
       if (n0==0)
         {

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilterPeakSearch.cc

@@ -271 +271 @@
   MRawEvtPixelIter pixel(fRawEvt);
 
-  Int_t   sat;
-  Byte_t  satpos;
+  Int_t   sat        = 0;
+  Byte_t  satpos     = 0;
   ULong_t gsatpos    = 0;
 
   Int_t   maxsumhi   = -1000000;
   Int_t   numsat     = 0;
-  Byte_t startslice;
+  Byte_t  startslice = 0;
 
   Byte_t hiGainFirstsave = fHiGainFirst;
@@ -319 +319 @@
     fHiGainFirst = higainfirst - fOffsetLeftFromPeak;
   else
-    fHiGainOutOfRangeLeft++;
-
+    {
+      //      *fLog << err << (Int_t)higainfirst << "   " << (int)fHiGainFirst << "  " << (int)fOffsetLeftFromPeak << endl;      
+      fHiGainOutOfRangeLeft++;
+    }
+  
   //
   // Shift the last slice to the right:
   //
   const Byte_t rlim = higainfirst + fOffsetRightFromPeak + fWindowSizeHiGain;
-  if (rlim <= hiGainLastsave+fHiLoLast)
-    if (rlim > hiGainLastsave)
+  if (rlim <= fHiGainLast+fHiLoLast)
+    if (rlim > fHiGainLast)
       fHiLoLast   = rlim - fHiGainLast;
     else
@@ -334 +337 @@
       }
   else 
-    fHiGainOutOfRangeRight++;
-      
-
+    {
+      fHiGainOutOfRangeRight++;
+      //      *fLog << err << (Int_t)higainfirst << endl;
+    }
+  
   const Byte_t llim = fHiGainFirst + (Int_t)fOffsetLoGain;
   if ( llim >= fLoGainFirst ) 
@@ -544 +549 @@
 
     MExtractTimeAndChargeDigitalFilter::Print(o);
-    *fLog << " Offset from Peak left:   " << fOffsetLeftFromPeak   << endl;
-    *fLog << " Offset from Peak right:  " << fOffsetRightFromPeak  << endl;
-    *fLog << " Peak search window size: " << fPeakSearchWindowSize << endl;
+    *fLog << " Offset from Peak left:   " << (int)fOffsetLeftFromPeak   << endl;
+    *fLog << " Offset from Peak right:  " << (int)fOffsetRightFromPeak  << endl;
+    *fLog << " Peak search window size: " << (int)fPeakSearchWindowSize << endl;
     *fLog << " High Gain Failure limit: " << fHiGainFailureLimit << endl;
     *fLog << " Low Gain Failure limit:  " << fLoGainFailureLimit << endl;