Changeset 2141 for trunk/MagicSoft/Mars

Timestamp:

05/26/03 14:52:33 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• manalysis/MPadSchweizer.cc (modified) (1 diff)
• mfileio/MCT1ReadPreProc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/05/26: Wolfgang Wittek
+
+   * mfileio/MCT1ReadPreProc.cc
+     - put back :  if (event.spixsig_10thphot[i]==0)
+                         continue;
+ 
+   * Manalysis/MPadSchweizer.cc
+     - add pixels to MCerPhotEvt which are not yet in;
+       set their number of photons equal to zero
+
+
+
  2003/05/23: Abelardo Moralejo
 
@@ -75 +88 @@
        seem to work well. Any other kind of ordering might be harmful 
        as well (in theta, phi or whatever).
+
+
+
 
 

trunk/MagicSoft/Mars/manalysis/MPadSchweizer.cc

@@ -268 +268 @@
   //*fLog << "Entry MPadSchweizer::Process();" << endl;
 
+  //------------------------------------------------
+  // add pixels to MCerPhotEvt which are not yet in;
+  // set their numnber of photons equal to zero
+
+  UInt_t imaxnumpix = fCam->GetNumPixels();
+
+  for (UInt_t i=0; i<imaxnumpix; i++)
+  {
+    Bool_t alreadythere = kFALSE;
+    UInt_t npix = fEvt->GetNumPixels();
+    for (UInt_t j=0; j<npix; j++)
+    {
+      MCerPhotPix &pix = (*fEvt)[j];
+      UInt_t id = pix.GetPixId();
+      if (i==id)
+      {
+        alreadythere = kTRUE;
+        break;
+      }
+    }
+    if (alreadythere)
+      continue;
+
+    fEvt->AddPixel(i, 0.0, (*fPed)[i].GetMeanRms());
+  }
+
+
+
+  //-----------------------------------------
   Int_t rc=0;
 

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -920 +920 @@
     for (Int_t i=0; i<iMAXNUMPIX; i++)
     {
-        // next 2 statements commented out by WW
-        //if (event.spixsig_10thphot[i]==0)
-        //      continue;
+      //*fLog << event.spixsig_10thphot[i] << " ";
+
+      if (event.spixsig_10thphot[i]==0)
+            continue;
 
         fNphot->AddPixel(i, 0.1*event.spixsig_10thphot[i],