Changeset 6569 for trunk/MagicSoft/Mars/manalysis

Timestamp:

02/17/05 17:09:00 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCameraData.cc (modified) (1 diff)
• MCameraData.h (modified) (1 diff)
• MCerPhotAnal2.cc (modified) (6 diffs)
• MCerPhotAnal2.h (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCameraData.cc

@@ -420 +420 @@
     *fLog << warn << "MCameraData::DrawPixelContent - not available." << endl;
 }
+
+void MCameraData::Print(Option_t *o) const
+{
+    MParContainer::Print(o);
+    *fLog << "Size = " << fData.GetSize() << endl;
+    for (int i=0; i<fData.GetSize(); i++)
+        cout << i << ": " << fData[i] << endl;
+}

trunk/MagicSoft/Mars/manalysis/MCameraData.h

@@ -52 +52 @@
     Double_t operator[](int i) { return fData[i]; }
 
+    void Print(Option_t *o="") const;
+
     Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;
     void DrawPixelContent(Int_t num) const;

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.cc

@@ -31 +31 @@
 //
 //  Input Containers:
-//   MRawEvtData, MPedPhotCam
+//   MRawEvtData, MPedestalCam
 //
 //  Output Containers:
@@ -48 +48 @@
 #include "MRawEvtData.h"       // MRawEvtData::GetNumPixels
 #include "MCerPhotEvt.h"
-#include "MPedPhotPix.h"
-#include "MPedPhotCam.h"
+#include "MPedestalPix.h"
+#include "MPedestalCam.h"
 #include "MRawEvtPixelIter.h"
 
@@ -78 +78 @@
 //  - MRawRunHeader
 //  - MRawEvtData
-//  - MPedPhotCam
+//  - MPestalCam
 //
 // The following output containers are also searched and created if
@@ -124 +124 @@
     }
 
-    fPedestals = (MPedPhotCam*)pList->FindCreateObj("MPedPhotCam");
+    fPedestals = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
     if (runheader && !fPedestals)
         return kFALSE;
@@ -263 +263 @@
 
         Int_t idx = pixel.GetPixelId();
-        fCerPhotEvt->AddPixel(idx, s, sigs);
+//        fCerPhotEvt->AddPixel(idx, s, sigs);
 
         // Preliminary: Do not overwrite pedestals calculated by
@@ -271 +271 @@
     }
 
-    fCerPhotEvt->FixSize();
-    fCerPhotEvt->SetReadyToSave();
+//    fCerPhotEvt->FixSize();
+//    fCerPhotEvt->SetReadyToSave();
 
     if (fPedestals)

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal2.h

@@ -16 +16 @@
 
 class MRawEvtData;
-class MPedPhotCam;
+class MPedestalCam;
 class MCerPhotEvt;
 class MRawRunHeader;
@@ -23 +23 @@
 {
 private:
-    MPedPhotCam   *fPedestals;  // Pedestals of all pixels in the camera
+    MPedestalCam  *fPedestals;  // Pedestals of all pixels in the camera
     MRawEvtData   *fRawEvt;     // raw event data (time slices)
     MCerPhotEvt   *fCerPhotEvt; // Cerenkov Photon Event used for calculation