Changeset 2893

Timestamp:

01/23/04 16:13:57 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• manalysis/MExtractSignal.cc (modified) (4 diffs)
• mbase/MStatusDisplay.cc (modified) (1 diff)
• mcalib/MCalibrate.cc (modified) (1 diff)
• mcamera/MCameraDC.cc (modified) (3 diffs)
• mhist/MHCamEvent.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -153 +153 @@
     fSignals->Clear();
 
+    UInt_t satlo=0;
+
     while (pixel.Next())
     {
@@ -196 +198 @@
         Byte_t maxlo  = 0;
         Byte_t midlo  = 0;
-        
+
         for (ptr=first;ptr<last;ptr++)
           {
@@ -208 +210 @@
             sumLo += *ptr;
 
-            if (*ptr >= fSaturationLimit)
-              satLo++;
+            if (*ptr >= fSaturationLimit)
+                satLo++;
           }
 
         if (satLo)
-          *fLog << warn << "WARNING: Saturation of Lo Gain reached in " 
-                << satLo << " time slices in pixel " << pixid << endl;
+            satlo++;
 
         pix.SetExtractedSignal((Float_t)sumHi - pedes*(Float_t)fNumHiGainSamples,
@@ -231 +232 @@
       } /* while (pixel.Next()) */
 
+    if (satlo)
+        *fLog << warn << "WARNING - Lo Gain saturated in " << satlo << " pixels." << endl;
+
 
     fSignals->SetReadyToSave();

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1548 +1548 @@
     TCanvas *c;
     while ((c=(TCanvas*)Next()))
-        DrawClonePad(AddTab(c->GetName()), *c);
+        if (!GetCanvas(c->GetName()))
+            DrawClonePad(AddTab(c->GetName()), *c);
 
     *fLog << inf << "MStatusDisplay: Key " << name << " with " << n << " keys read from file." << endl;

trunk/MagicSoft/Mars/mcalib/MCalibrate.cc

@@ -161 +161 @@
       nphotErr  = TMath::Sqrt(nphotErr);
       
-      fCerPhotEvt->AddPixel(pixid, nphot, nphotErr);
+      MCerPhotPix *cpix = fCerPhotEvt->AddPixel(pixid, nphot, nphotErr);
       
       if (sig.GetNumLoGainSaturated() > 0)
-        (*fCerPhotEvt)[pixid].SetPixelSaturated();
+          cpix->SetPixelSaturated();
     }
   

trunk/MagicSoft/Mars/mcamera/MCameraDC.cc

@@ -52 +52 @@
 // --------------------------------------------------------------------------
 //
-// Print the hillas Parameters to *fLog
+// Print the dc currents
 //
 void MCameraDC::Print(Option_t *) const
@@ -62 +62 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return the minimum dc current
+//
 Float_t MCameraDC::GetMin() const
 {
@@ -70 +74 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Return the maximum dc current
+//
 Float_t MCameraDC::GetMax() const
 {

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -97 +97 @@
     MGeomCam *cam = (MGeomCam*)plist->FindObject("MGeomCam");
     if (!cam)
-        *fLog << warn << GetDescriptor() << ": No MGeomCam found." << endl;
+    {
+        *fLog << err << GetDescriptor() << ": No MGeomCam found." << endl;
+        return kFALSE;
+    }
 
     if (fSum)
@@ -114 +117 @@
     fRms = new MHCamera(*cam, name+";rms", fTitle);
     fRms->SetYTitle("a.u.");
+
     return kTRUE;
 }