Changeset 2454 for trunk/MagicSoft/Mars/manalysis

Timestamp:

11/03/03 15:41:36 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MMcPedestalCopy.cc (modified) (3 diffs)
• MMcPedestalCopy.h (modified) (1 diff)
• MMcPedestalNSBAdd.cc (modified) (3 diffs)
• MMcPedestalNSBAdd.h (modified) (2 diffs)
• MMcPedestalRead.cc (deleted)
• MMcPedestalRead.h (deleted)

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.cc

@@ -89 +89 @@
 // --------------------------------------------------------------------------
 //
+// Check for the runtype.
 // Search for MPedestalCam and MMcFadcHeader.
 //
-Int_t MMcPedestalCopy::PreProcess(MParList *pList)
+Bool_t MMcPedestalCopy::ReInit(MParList *pList)
 {
-    fMcRun = (MMcRunHeader*)pList->FindObject("MMcRunHeader");
-    if (!fMcRun)
+    //
+    // If it is no MC file skip this function...
+    //
+    if (!CheckRunType(pList))
+        return kTRUE;
+
+    //
+    // Now check the existance of all necessary containers. This has
+    // to be done only if this is a MC file.
+    //
+    MPedestalCam *pedcam = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
+    if (!pedcam)
+        return kFALSE;
+
+    MMcRunHeader *mcrun = (MMcRunHeader*)pList->FindObject("MMcRunHeader");
+    if (!mcrun)
         *fLog << warn << dbginf << "MMcRunHeader not found... assuming camera<0.7" << endl;
 
-    fPedCam = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
-    if (!fPedCam)
-        return kFALSE;
-
-    fMcPed = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
-    if (!fMcPed)
+    MMcFadcHeader *fadc = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
+    if (!fadc)
     {
         *fLog << err << dbginf << "MMcFadcHeader not found... aborting." << endl;
@@ -108 +119 @@
     }
 
-    return kTRUE;
-}
+    const int num = pedcam->GetSize();
 
-// --------------------------------------------------------------------------
-//
-// Check for the runtype.
-// Initialize the size of MPedestalCam to the number of pixels from
-// MMcFadcHeader.
-//
-Bool_t MMcPedestalCopy::ReInit(MParList *pList)
-{
-    if (!CheckRunType(pList))
-        return kFALSE;
-
-    const int num = fPedCam->GetSize();
-
-    const Bool_t camver70 = fMcRun && fMcRun->GetCamVersion()>=70;
+    const Bool_t camver70 = mcrun && mcrun->GetCamVersion()>=70;
 
     for (int i=0; i<num; i++)
     {
-        MPedestalPix &pix = (*fPedCam)[i];
+        MPedestalPix &pix = (*pedcam)[i];
 
         // Here one should compute the Pedestal taking into account how
         // the MC makes the transformation analogic-digital for the FADC.
+        // This is done only once per file -> not time critical.
 
-        const Float_t pedest = fMcPed->GetPedestal(i);
-        const Float_t sigma  = camver70 ? fMcPed->GetPedestalRmsHigh(i) : fMcPed->GetElecNoise(i);
+        const Float_t pedest = fadc->GetPedestal(i);
+        const Float_t sigma  = camver70 ? fadc->GetPedestalRmsHigh(i) : fadc->GetElecNoise(i);
 
         pix.Set(pedest, sigma);
@@ -140 +138 @@
 
     if (camver70)
-        fPedCam->SetReadyToSave();
+        pedcam->SetReadyToSave();
 
     return kTRUE;

trunk/MagicSoft/Mars/manalysis/MMcPedestalCopy.h

@@ -6 +6 @@
 #endif
 
-class MMcFadcHeader;
-class MMcRunHeader;
-class MPedestalCam;
-
 class MMcPedestalCopy : public MTask
 {
 private:
-    const MMcFadcHeader *fMcPed;
-    const MMcRunHeader  *fMcRun;
-
-    MPedestalCam *fPedCam;
-
     Bool_t CheckRunType(MParList *pList) const;
-
-    Int_t  PreProcess(MParList *pList);
     Bool_t ReInit(MParList *pList);
 

trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.cc

@@ -125 +125 @@
 // --------------------------------------------------------------------------
 //
-// - check whether we have a monte carlo file. if not skip this task
-// - try to get MMcFadcHeader, MGeomCam and MPedestalCam from the parameter
-//   list
-// - try to find a MMcRunHeader, too
-//
-Int_t MMcPedestalNSBAdd::PreProcess(MParList *pList)
-{
-    fFadc = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
-    if (!fFadc)
-    {
-        *fLog << err << dbginf << "MMcFadcHeader not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
-    if (!fGeom)
-    {
-        *fLog << err << dbginf << "MGeomCam not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    fPedCam = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
-    if (!fPedCam)
-        return kFALSE;
-
-    return kTRUE;
-}
-
-// --------------------------------------------------------------------------
-//
 // If a MMcRunHeader is available the DNSB MMcRunHeader::GetNumPheFromDNSB
 // is returned. Otherwise the user given number is used.
@@ -199 +169 @@
 Bool_t MMcPedestalNSBAdd::ReInit(MParList *pList)
 {
+    //
+    // If it is no MC file skip this function...
+    //
     if (!CheckRunType(pList))
-        return kFALSE;
-
+        return kTRUE;
+
+    //
+    // If it is the wrong camera version this algorithm is not needed...
+    //
     if (!CheckCamVersion(pList))
         return kTRUE;
 
+    //
+    // Now check the existance of all necessary containers. This has
+    // to be done only if this is a MC file and the camera version
+    // is correct.
+    //
+    MPedestalCam *pedcam = (MPedestalCam*)pList->FindCreateObj("MPedestalCam");
+    if (!pedcam)
+        return kFALSE;
+
+    MMcFadcHeader *fadc = (MMcFadcHeader*)pList->FindObject("MMcFadcHeader");
+    if (!fadc)
+    {
+        *fLog << err << dbginf << "MMcFadcHeader not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    MGeomCam *geom = (MGeomCam*)pList->FindObject("MGeomCam");
+    if (!geom)
+    {
+        *fLog << err << dbginf << "MGeomCam not found... aborting." << endl;
+        return kFALSE;
+    }
+
     const Float_t dnsbpix = GetDnsb(pList) * 50.0/15.0;
 
@@ -210 +209 @@
         return kFALSE;
 
-    const int num = fPedCam->GetSize();
+    const int num = pedcam->GetSize();
 
     for (int i=0; i<num; i++)
     {
-        MPedestalPix &pix    = (*fPedCam)[i];
+        MPedestalPix &pix    = (*pedcam)[i];
 
         const Float_t pedrms = pix.GetPedestalRms();
-        const Float_t ratio  = fGeom->GetPixRatio(i);
-        const Float_t ampl   = fFadc->GetAmplitud();
+        const Float_t ratio  = geom->GetPixRatio(i);
+        const Float_t ampl   = fadc->GetAmplitud();
 
         pix.SetPedestalRms(sqrt(pedrms*pedrms + dnsbpix*ampl*ampl/ratio));
     }
 
-    fPedCam->SetReadyToSave();
+    pedcam->SetReadyToSave();
 
     return kTRUE;
 }
-

trunk/MagicSoft/Mars/manalysis/MMcPedestalNSBAdd.h

@@ -6 +6 @@
 #endif
 
-class MMcFadcHeader;
-class MGeomCam;
-class MPedestalCam;
-
 class MMcPedestalNSBAdd : public MTask
 {
 private:
-    const MGeomCam      *fGeom;
-    const MMcFadcHeader *fFadc;
-
-    MPedestalCam *fPedCam;
-
     Float_t fDnsbPixel;
 
@@ -25 +16 @@
     Float_t GetDnsb(MParList *pList) const;
 
-    Int_t  PreProcess(MParList *pList);
     Bool_t ReInit(MParList *pList);
-
 
 public: