Changeset 6855 for trunk/MagicSoft/Mars/mhft

Timestamp:

03/18/05 17:21:58 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhft

Files:

• MGeomCamMagicEnhance.cc (modified) (1 diff)
• MHexagonalFTCalc.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhft/MGeomCamMagicEnhance.cc

@@ -163 +163 @@
 
     // Copy result into output MCerPhotEvt
-    fEvtOut->Reset();
+    fEvtOut->InitSize(res.GetSize());
 
     for (UInt_t i=0; i<res.GetSize(); i++)
         fEvtOut->AddPixel(i, res[i], 0);
 
-    fEvtOut->FixSize();
+    //fEvtOut->FixSize();
     fEvtOut->SetReadyToSave();
 

trunk/MagicSoft/Mars/mhft/MHexagonalFTCalc.cc

@@ -172 +172 @@
     fOffset.Reset();
 
-    fMap.Set(lim);
-    for (int i=0; i<lim; i++)
-        fMap[i]=-1;
+    //fMap.Set(lim);
+    //for (int i=0; i<lim; i++)
+    //    fMap[i]=-1;
 
     const Double_t dx = (*geom)[2].GetX(); // -(*geom)[0].GetX()
@@ -190 +190 @@
         if ((*geom)[idx].GetAidx()==0)
         {
-            fMap[idx]  = i;
+            //fMap[idx]  = i;
             fOffset[i] = 1;
         }
@@ -254 +254 @@
     MArrayD re(lim);
 
-    MCerPhotPix *pix=0;
-
-    MCerPhotEvtIter Next(fEvtIn, kFALSE);
-
+    //    MCerPhotPix *pix=0;
+    //    MCerPhotEvtIter Next(fEvtIn, kFALSE);
+    //    while ((pix = (MCerPhotPix*)Next()))
     // Copy data from MCerPhotEvt into array
-    while ((pix = (MCerPhotPix*)Next()))
-    {
-        const Int_t idx = pix->GetPixId();
-        if (fMap[idx]>=0)
-            re[fMap[idx]] = pix->GetNumPhotons();
+    const UInt_t npix = fEvtIn->GetNumPixels();
+    for (UInt_t idx=0; idx<npix; idx++)
+    {
+        //const Int_t idx = pix->GetPixId();
+        //if (fMap[idx]>=0)
+        re[idx] = (*fEvtIn)[idx].GetNumPhotons();
     }
 
@@ -307 +307 @@
         return kTRUE;
 
-    fEvtOut->Reset();
+    fEvtOut->InitSize(lim); // necessary?
     for (int i=0; i<lim; i++)
     {
-        const Int_t map = fMap[i];
-        if (map>=0)
-            fEvtOut->AddPixel(i, out[map]);
-    }
-    fEvtOut->FixSize();
+        //const Int_t map = fMap[i];
+        //if (map>=0)
+        fEvtOut->AddPixel(i, out[i]);
+    }
+    //fEvtOut->FixSize();
     fEvtOut->SetReadyToSave();