Changeset 4073 for trunk/MagicSoft/Mars/mtemp/mifae/library

Timestamp:

05/14/04 16:45:04 (21 years ago)

Author:

jlopez

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae/library

Files:

• MCalibrateDC.cc (modified) (5 diffs)
• MCalibrateDC.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/library/MCalibrateDC.cc

@@ -42 +42 @@
 
 #include "MParList.h"
+#include "MTaskList.h"
+#include "MEvtLoop.h"
+
+#include "MReadReports.h"
+#include "MGeomApply.h"
 
 ClassImp(MCalibrateDC);
@@ -82 +87 @@
     }
 
+    // Initialization of objects that need the information from MGeomCam
+    fDisplay.SetGeometry(*fGeomCam);
+    fNumPixels = fGeomCam->GetNumPixels();
+
     fCurr = (MCameraDC*)pList->FindObject(AddSerialNumber("MCameraDC"));
 
@@ -99 +108 @@
 
     // Run over the continuos light run to get the DC intercalibration factors
-    fNumPixels = fGeomCam->GetNumPixels();
     fDCCalibrationFactor.Set(fNumPixels);
     fDCCalibrationFactor.Reset(1.);
@@ -105 +113 @@
     if ( fFileName != "" )
       {
-        // FIXME::Here it should be done the loop over the continuos light run
+        ProcessFile();
         DCCalibrationCalc();
  
@@ -136 +144 @@
           
   return kTRUE;
+}
+
+Bool_t MCalibrateDC::ProcessFile()
+{
+
+    MParList plist;
+    MTaskList tlist;
+    plist.AddToList(&tlist);
+
+    MCameraDC     dccam;
+    plist.AddToList(&dccam);
+
+    // Reads the trees of the root file and the analysed branches
+    MReadReports read;
+    read.AddTree("Currents"); 
+    read.AddFile(fFileName);     // after the reading of the trees!!!
+    read.AddToBranchList("MReportCurrents.*");
+    
+    MGeomApply geomapl;
+
+    tlist.AddToList(&geomapl);
+    tlist.AddToList(&read);
+
+    // Enable logging to file
+    //*fLog.SetOutputFile(lname, kTRUE);
+
+    //
+    // Execute the eventloop
+    //
+    MEvtLoop evtloop(fName);
+    evtloop.SetParList(&plist);
+    evtloop.SetLogStream(fLog);
+
+    // Execute first analysis
+      if (!evtloop.PreProcess())
+        {
+          *fLog << err << GetDescriptor() << ": Failed." << endl;
+          return kFALSE;
+        }
+        
+      while (tlist.Process())
+        fDisplay.AddCamContent(dccam);
+        
+      evtloop.PostProcess();
+
+    tlist.PrintStatistics();
+
+    UInt_t numexecutions = read.GetNumExecutions();
+    UInt_t numPixels = fDisplay.GetNumPixels();
+    for (UInt_t pix = 1; pix < numPixels; pix++)
+      fDisplay[pix] /= numexecutions;
+    
+
+    *fLog << inf << GetDescriptor() << ": Done." << endl;
+
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mtemp/mifae/library/MCalibrateDC.h

@@ -2 +2 @@
 #define MARS_MCalibrateDC
 
-#ifndef ROOT_TArrayF
-#include <TArrayF.h>
+#ifndef ROOT_TArrayD
+#include <TArrayD.h>
 #endif
 
@@ -44 +44 @@
 
     UInt_t fNumPixels ;
-    TArrayF fDCCalibrationFactor;
-    Float_t fDCMissCalibrationFactor;
+    TArrayD fDCCalibrationFactor;
+    Double_t fDCMissCalibrationFactor;
     
-    Float_t fDCCalibration; //[uA]
-    Float_t fDCCalibrationRMS; //[uA]
+    Double_t fDCCalibration; //[uA]
+    Double_t fDCCalibrationRMS; //[uA]
     
+    Bool_t ProcessFile();
     Bool_t DCCalibrationCalc();
     
@@ -63 +64 @@
     void SetFileName(TString filename="") {fFileName=filename;}
     
-  ClassDef(MCalibrateDC, 0) // Taks to intercalibrate the DC of all pmts from a continuos light run
+    //Getters
+    MHCamera& GetDisplay() { return fDisplay; }
+    TArrayD&  GetDCCalibrationFactor() { return fDCCalibrationFactor; }
+
+    ClassDef(MCalibrateDC, 0) // Taks to intercalibrate the DC of all pmts from a continuos light run
 };