Changeset 1961 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/17/03 08:03:48 (22 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MPadSchweizer.cc (modified) (5 diffs)
• MSigmabar.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/manalysis/MPadSchweizer.cc

@@ -267 +267 @@
   Double_t SigbarOld;
 
+
+  SigbarOld = fSigmabar->Calc(*fCam, *fPed, *fEvt);
   //*fLog << "before padding : " << endl;
-  //SigbarOld = fSigmabar->Calc(*fCam, *fPed, *fEvt);
   //fSigmabar->Print("");
 
@@ -407 +408 @@
   //
   // pad only pixels   - which are used (before image cleaning)
-  //                   - and for which the no.of photons is != 0.0
   //
   Double_t Sig         = 0.0;
@@ -422 +422 @@
       continue;
 
-    if ( pix.GetNumPhotons() == 0.0)
-    {
-      *fLog << "MPadSchweizer::Process(); no.of photons is 0 for used pixel" 
-            << endl;
-      continue;
-    }
+    //if ( pix.GetNumPhotons() == 0.0)
+    //{
+    //  *fLog << "MPadSchweizer::Process(); no.of photons is 0 for used pixel" 
+    //        << endl;
+    //  continue;
+    //}
 
     Int_t j = pix.GetPixId();
@@ -572 +572 @@
 
     fHNSB->Fill( NSB/sqrt(Area) );
-    fHPhotons->Fill( newphotons/sqrt(Area), oldphotons/sqrt(Area) );
+    fHPhotons->Fill( oldphotons/sqrt(Area), newphotons/sqrt(Area) );
 
 
@@ -604 +604 @@
       continue;
 
-    if ( pix.GetNumPhotons() == 0.0)
-    {
-      *fLog << "MPadSchweizer::Process(); no.of photons is 0 for used pixel" 
-            << endl;
-      continue;
-    }
+    //if ( pix.GetNumPhotons() == 0.0)
+    //{
+    //  *fLog << "MPadSchweizer::Process(); no.of photons is 0 for used pixel" 
+    //        << endl;
+    //  continue;
+    //}
 
     Int_t j = pix.GetPixId();

trunk/MagicSoft/Mars/manalysis/MSigmabar.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Robert Wagner, 10/2002 <mailto:magicsoft@rwagner.de>
+!   Author(s): Robert Wagner,   10/2002 <mailto:magicsoft@rwagner.de>
 !   Author(s): Wolfgang Wittek, 01/2003 <mailto:wittek@mppmu.mpg.de>
-!   Author(s): Thomas Bretz, 04/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
+!   Author(s): Thomas Bretz,    04/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
 !
 !   Copyright: MAGIC Software Development, 2003
@@ -103 +103 @@
     memset(innerPixels, 0, sizeof(innerPixels));
     memset(outerPixels, 0, sizeof(outerPixels));
-    memset(outerSquaredSum, 0, sizeof(outerSquaredSum));
+    memset(innerSquaredSum, 0, sizeof(innerSquaredSum));
     memset(outerSquaredSum, 0, sizeof(outerSquaredSum));
 
@@ -115 +115 @@
 
     const UInt_t npix = evt.GetNumPixels();
+
+    //*fLog << "MSigmabar : npix = " << npix << endl;
 
     for (UInt_t i=0; i<npix; i++)
@@ -121 +123 @@
         if (!cerpix.IsPixelUsed())
             continue;
-        /*
+
+        /*
          if ( cerpix.GetNumPhotons() == 0 )
          {
@@ -128 +131 @@
          continue;
          }
-         */
+        */
+
         const Int_t id = cerpix.GetPixId();
         const Double_t area = geom.GetPixRatio(id);
+
+        if (id == 0)
+        {
+          //*fLog << "MSigmabar : id = 0;  pixel '0' is used, ignore it" 
+          //      << endl;
+          continue;
+        }
 
         const MGeomPix    &gpix = geom[id];
@@ -226 +237 @@
 
 }
+
+
+
+
+
+