Changeset 2454

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MMcPedestalCopy.cc (modified) (3 diffs)
• manalysis/MMcPedestalCopy.h (modified) (1 diff)
• manalysis/MMcPedestalNSBAdd.cc (modified) (3 diffs)
• manalysis/MMcPedestalNSBAdd.h (modified) (2 diffs)
• manalysis/MMcPedestalRead.cc (deleted)
• manalysis/MMcPedestalRead.h (deleted)
• mbase/MEvtLoop.cc (modified) (4 diffs)
• mbase/MTask.h (modified) (1 diff)
• mbase/MTaskList.cc (modified) (1 diff)
• mimage/MHillasCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+  2003/11/03: Thomas Bretz
+  
+   * manalysis/MMcPedestalCopy.[h,cc], manalysis/MMcPedestalNSBAdd.[h,cc]:
+     - fixed such, that it now works correctly with non-MC files
+     - moved container requests from PreProcess to ReInit
+     - removed some obsolete data members - made them locally
+     
+   * manalysis/MMcPedestalRead.[h,cc]:
+     - removed
+     
+   * mbase/MEvtLoop.cc:
+     - replaced the gApplication->InheritsFrom(TRint::Class())
+       workaround for thread safty by the more correct check
+       whether we are running in the main Thread (TThread::Self())
+       
+   * mbase/MTask.h:
+     - added the missing const-qualifier to GetNumExecutions
+     
+   * mbase/MTaskList.cc:
+     - fixed a typo in the output
+     
+   * mimage/MHillasCalc.[h,cc]:
+     - replaced TArrayC by TArrayL to support huge number of events
+     - added PrintSkipped
+     - added comments to the data members
+
+
+
  2003/10/31: Marcos Lopez
 
-   * mhist/MFill.cc:
+   * mhist/MFillH.cc:
      - Fixed a bug in function PreProcess(MParList *pList). Inside the 
        conditional sentence "if (!fWeight && !fWeightName.IsNull())",  
        fWeight never pointed to the object MWeight recoverd from the 
        parameter list.
-  
-    * mhistmc/MHMcEnergyImpact.cc  
-      - In the Fill function, pass the weight to the histogram fHist.
-
-   * mmontecarlo/MMcWeightEnergySpecCalc.[h,cc] 
-      - Added new class for changing the energy spectrum of the showers 
-        simulated with Corsika to a different one, be using weights   
+
+   * mhistmc/MHMcEnergyImpact.cc:
+     - In the Fill function, pass the weight to the histogram fHist.
+
+   * mmontecarlo/MMcWeightEnergySpecCalc.[h,cc]:
+     - Added new class for changing the energy spectrum of the showers 
+       simulated with Corsika to a different one, be using weights   
                         
    * mmontecarlo/Makefile, MonteCarloLinkDef.h

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:

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -75 +75 @@
 #include <TTime.h>          // TTime
 #include <TFile.h>          // gFile
+#include <TThread.h>        // TThread::Self()
 #include <TDatime.h>        // TDatime
 #include <TSystem.h>        // gSystem
@@ -372 +373 @@
         fProgress->SetPosition(num/fNumEvents);
 
-    //
-    // Handle GUI events (display changes)
-    //
+
+    // FIXME: This is a workaround, because TApplication::Run is not
+    //        thread safe against ProcessEvents. We assume, that if
+    //        we are not in the Main-Thread ProcessEvents() is
+    //        called by the TApplication Event Loop...
+    if (!TThread::Self()/*gApplication->InheritsFrom(TRint::Class())*/)
+    {
+        //
+        // Handle GUI events (display changes)
+        //
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)
-    gSystem->ProcessEvents();
+        gSystem->ProcessEvents();
 #else
-    // FIXME: This is a workaround, because TApplication::Run is not thread safe against ProcessEvents
-    if (gApplication->InheritsFrom(TRint::Class()))
-    {
         if (fDisplay)
             gSystem->ProcessEvents();
@@ -386 +391 @@
             if (fProgress)
                 gClient->ProcessEventsFor(fProgress);
-    }
 #endif
+    }
 
     return rc;
@@ -485 +490 @@
         //fProgress->SetPosition(maxcnt>0 ? TMath::Min(maxcnt, entries) : entries);
         fProgress->SetPosition(1);
-        // FIXME: This is a workaround, because TApplication::Run is not thread safe against ProcessEvents
-        if (gApplication->InheritsFrom(TRint::Class()))
+
+        // FIXME: This is a workaround, because TApplication::Run is not
+        //        thread safe against ProcessEvents. We assume, that if
+        //        we are not in the Main-Thread ProcessEvents() is
+        //        called by the TApplication Event Loop...
+        if (!TThread::Self()/*gApplication->InheritsFrom(TRint::Class())*/)
         {
 #if ROOT_VERSION_CODE < ROOT_VERSION(3,02,06)

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -71 +71 @@
     virtual void PrintStatistics(const Int_t lvl=0, Bool_t title=kFALSE) const;
 
-    UInt_t GetNumExecutions() { return fNumExecutions; }
+    UInt_t GetNumExecutions() const { return fNumExecutions; }
 
     virtual Bool_t ReInit(MParList *pList);

trunk/MagicSoft/Mars/mbase/MTaskList.cc

@@ -308 +308 @@
         if (!task->ReInit(pList?pList:fParList))
         {
-            *fLog << err << "ERROR - ReInit if Task " << task->GetDescriptor() << " failed." << endl;
+            *fLog << err << "ERROR - ReInit of Task '" << task->GetDescriptor() << "' failed." << endl;
             return kFALSE;
         }

trunk/MagicSoft/Mars/mimage/MHillasCalc.cc

@@ -173 +173 @@
 // --------------------------------------------------------------------------
 //
+//  This is used to print the output in the PostProcess. Later (having
+//  millions of events) we may want to improve the output.
+//
+void MHillasCalc::PrintSkipped(int i, const char *str) const
+{
+    *fLog << " " << setw(7) << fErrors[i] << " (";
+    *fLog << setw(3) << (int)(100.*fErrors[i]/GetNumExecutions());
+    *fLog << "%) Evts skipped due to: " << str << endl;
+}
+
+// --------------------------------------------------------------------------
+//
 //  Prints some statistics about the hillas calculation. The percentage
 //  is calculated with respect to the number of executions of this task.
@@ -184 +196 @@
     *fLog << GetDescriptor() << " execution statistics:" << endl;
     *fLog << dec << setfill(' ');
-    *fLog << " " << setw(7) << fErrors[1] << " (" << setw(3) << (int)(fErrors[1]*100/GetNumExecutions()) << "%) Evts skipped due to: Event has less than 3 pixels" << endl;
-    *fLog << " " << setw(7) << fErrors[2] << " (" << setw(3) << (int)(fErrors[2]*100/GetNumExecutions()) << "%) Evts skipped due to: Calculated Size == 0" << endl;
-    *fLog << " " << setw(7) << fErrors[3] << " (" << setw(3) << (int)(fErrors[3]*100/GetNumExecutions()) << "%) Evts skipped due to: Number of used pixels < 3" << endl;
-    *fLog << " " << setw(7) << fErrors[4] << " (" << setw(3) << (int)(fErrors[4]*100/GetNumExecutions()) << "%) Evts skipped due to: CorrXY==0" << endl;
-    *fLog << " " << fErrors[0] << " (" << (int)(fErrors[0]*100/GetNumExecutions()) << "%) Evts survived Hillas calculation!" << endl;
+    PrintSkipped(1, "Event has less than 3 pixels");
+    PrintSkipped(2, "Calculated Size == 0");
+    PrintSkipped(3, "Number of used pixels < 3");
+    PrintSkipped(4, "CorrXY==0");
+    *fLog << " " << (int)fErrors[0] << " (" << (int)(100.*fErrors[0]/GetNumExecutions()) << "%) Evts survived Hillas calculation!" << endl;
     *fLog << endl;