Changeset 710 for trunk/MagicSoft

Timestamp:

03/30/01 11:30:32 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• Makefile (modified) (2 diffs)
• macros/CT1Hillas.C (modified) (4 diffs)
• macros/MagicHillas.C (modified) (4 diffs)
• macros/readCT1.C (modified) (2 diffs)
• mars.cc (modified) (1 diff)
• mdatacheck/DataCheckIncl.h (modified) (1 diff)
• mdatacheck/DataCheckLinkDef.h (modified) (1 diff)
• mdatacheck/MFillHFadc.cc (deleted)
• mdatacheck/MFillHFadc.h (deleted)
• mdatacheck/MFillHHillas.cc (deleted)
• mdatacheck/MFillHHillas.h (deleted)
• mdatacheck/MHFadcCam.cc (deleted)
• mdatacheck/MHFadcCam.h (deleted)
• mdatacheck/MHFadcPix.cc (deleted)
• mdatacheck/MHFadcPix.h (deleted)
• mdatacheck/MHHillas.cc (deleted)
• mdatacheck/MHHillas.h (deleted)
• mdatacheck/Makefile (modified) (2 diffs)
• mgui/MGMarsMain.cc (modified) (1 diff)
• mgui/MGMarsMain.h (modified) (1 diff)
• mhist (added)
• mhist/HistIncl.h (added)
• mhist/HistLinkDef.h (added)
• mhist/MFillHFadc.cc (added)
• mhist/MFillHFadc.h (added)
• mhist/MFillHHillas.cc (added)
• mhist/MFillHHillas.h (added)
• mhist/MFillHStarMap.cc (added)
• mhist/MFillHStarMap.h (added)
• mhist/MHFadcCam.cc (added)
• mhist/MHFadcCam.h (added)
• mhist/MHFadcPix.cc (added)
• mhist/MHFadcPix.h (added)
• mhist/MHHillas.cc (added)
• mhist/MHHillas.h (added)
• mhist/MHStarMap.cc (added)
• mhist/MHStarMap.h (added)
• mhist/Makefile (added)
• mmontecarlo/MCollArea.cc (modified) (3 diffs)
• mmontecarlo/MCollArea.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
 
+ 2000/03/30: Thomas Bretz
+ 
+   * mdatacheck/MH*, mdatacheck/MFillH* moved to mhist
+ 
+ 
  2000/03/21: Thomas Bretz
                             

trunk/MagicSoft/Mars/Makefile

@@ -35 +35 @@
 #  ----->>>   mars libraries
 #
-SUBDIRS = mgui manalysis meventdisp mdatacheck mmontecarlo mbase mraw mmc
+SUBDIRS = mgui        \
+          manalysis   \
+          meventdisp  \
+          mdatacheck  \
+          mmontecarlo \
+          mhist       \
+          mbase       \
+          mraw        \
+          mmc
 
 LIBRARIES = $(SUBDIRS:=.a)
@@ -85 +93 @@
         @cd mraw; make mrproper; cd ..
         @echo "cd .."
+        @echo "cd mhist"
+        @cd mhist; make mrproper; cd ..
+        @echo "cd .."
         @echo "cd mgui"
         @cd mgui; make mrproper; cd ..

trunk/MagicSoft/Mars/macros/CT1Hillas.C

@@ -26 +26 @@
     // finished you must create them yourself and add it to the list
     //
-    MHHillas *hists = new MHHillas;
+    MHHillas  *hists = new MHHillas;
     plist->AddToList(hists);
+
+    MHStarMap *smap = new MHStarMap;
+    plist->AddToList(smap);
 
     //
@@ -37 +40 @@
     //  4) fill the hillas into the histograms
     //
-    MCT1ReadAscii read("CT1_99_on1.dat") ;
+    MCT1ReadAscii read("CT1_97_on1.dat") ;
     MImgCleanStd  clean;
     MHillasCalc   hcalc;
     MFillHHillas  hfill;
+    MFillHStarMap sfill;
 
     tlist.AddToList(&read);
@@ -46 +50 @@
     tlist.AddToList(&hcalc);
     tlist.AddToList(&hfill);
+    tlist.AddToList(&sfill);
 
     //
@@ -62 +67 @@
     //
     hists->Draw();
+    smap->Draw();
 }

trunk/MagicSoft/Mars/macros/MagicHillas.C

@@ -32 +32 @@
     plist->AddToList(hists);
 
+    MHStarMap *smap = new MHStarMap;
+    plist->AddToList(smap);
+
     //
     // Now setup the tasks and tasklist:
@@ -40 +43 @@
     //  4) fill the hillas into the histograms
     //
-    MReadTree    read("oscar_protons.root", "Events") ;
-    MCerPhotCalc ncalc;
-    MImgCleanStd clean;
-    MHillasCalc  hcalc;
-    MFillHHillas hfill;
+    MReadTree    read("Events", "oscar_protons.root");
+    read.AddFile("test.root");
+
+    MCerPhotCalc  ncalc;
+    MImgCleanStd  clean;
+    MHillasCalc   hcalc;
+    MFillHHillas  hfill;
+    MFillHStarMap sfill;
 
     tlist.AddToList(&read);
@@ -51 +57 @@
     tlist.AddToList(&hcalc);
     tlist.AddToList(&hfill);
+    tlist.AddToList(&sfill);
 
     //
@@ -67 +74 @@
     //
     hists->Draw();
+    smap->Draw();
 }
+

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -11 +11 @@
     plist->AddToList(&tlist);
 
-    MCT1ReadAscii read("CT1_99_on1.dat") ;
+    MCT1ReadAscii read("CT1_99_off1.dat") ;
     MImgCleanStd  clean;
     MHillasCalc   hcalc;
@@ -29 +29 @@
     Int_t icount = 0 ;
     MCamDisplay display(&geomcam) ;
+        display.DrawPhotNum(&phevt);
+
 
     while (read.Process())
     {
         cout << "Event: " << icount++  << endl  ;
-
-        if (icount < 45 )
-            continue;
 
         display.DrawPhotNum(&phevt);

trunk/MagicSoft/Mars/mars.cc

@@ -26 +26 @@
   // start the main window
   
-  MGMarsMain mainWin(gClient->GetRoot(), 400, 650);     
+  MGMarsMain *mainWin = new MGMarsMain(400, 650);
   
   theApp.Run();

trunk/MagicSoft/Mars/mdatacheck/DataCheckIncl.h

@@ -1 +1 @@
 #ifndef __CINT__
 
-#include "MParList.h"
-
-#include "MRawRunHeader.h"
-#include "MRawEvtHeader.h"
-#include "MRawEvtData.h"
-#include "MRawCrateArray.h"
-#include "MTime.h"
-#include "MInputStreamID.h"
-
-#include "MReadTree.h"
-
 #endif // __CINT__

trunk/MagicSoft/Mars/mdatacheck/DataCheckLinkDef.h

@@ -5 +5 @@
 #pragma link off all functions;
 
-#pragma link C++ class MHFadcCam;
-#pragma link C++ class MHFadcPix;
-#pragma link C++ class MHHillas;
-
 #pragma link C++ class MShowSpect;
-
-#pragma link C++ class MFillHFadc;
-#pragma link C++ class MFillHHillas;
-
 #pragma link C++ class MDumpEvtHeader;
 

trunk/MagicSoft/Mars/mdatacheck/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mraw -I../manalysis
+INCLUDES = -I. -I../mbase -I../mraw -I../mhist
 
 #------------------------------------------------------------------------------
@@ -29 +29 @@
 
 SRCFILES = MDumpEvtHeader.cc \
-           MFillHFadc.cc \
-           MFillHHillas.cc \
            MGDisplayAdc.cc \
-           MHFadcPix.cc \
-           MHFadcCam.cc \
-           MHHillas.cc \
            MShowSpect.cc \
            MViewAdcSpectra.cc 

trunk/MagicSoft/Mars/mgui/MGMarsMain.cc

@@ -31 +31 @@
 
 
-MGMarsMain::MGMarsMain(const TGWindow *p, UInt_t w, UInt_t h)
-  : TGMainFrame(p, w, h)
+MGMarsMain::MGMarsMain(/*const TGWindow *p,*/ UInt_t w, UInt_t h)
+  : TGMainFrame(gClient->GetRoot(), w, h)
 { 
   //    First create the MenuBar.   

trunk/MagicSoft/Mars/mgui/MGMarsMain.h

@@ -56 +56 @@
  
  public: 
-  MGMarsMain(const TGWindow *p, UInt_t w, UInt_t h) ;
+  MGMarsMain(/*const TGWindow *p,*/ UInt_t w, UInt_t h) ;
   
   ~MGMarsMain(); 

trunk/MagicSoft/Mars/mmontecarlo/MCollArea.cc

@@ -34 +34 @@
                       50, 0., 500. ) ; 
 
-  fHistColl = new TH1D("collArea", "Collection Area", 
-                       50, 0., 5.) ; 
+  fHistCol = new TH1D("collArea", "Collection Area",
+                      50, 0., 5.) ;
   
 } 
@@ -43 +43 @@
   delete fHistAll ; 
   delete fHistSel ; 
-  delete fHistColl ; 
+  delete fHistCol ;
 } 
 
@@ -68 +68 @@
 void MCollArea::Draw(Option_t* option) 
 { 
-  fHistColl->Draw(option) ; 
+  fHistCol->Draw(option) ;
 } 
 
-void MCollArea::CalculateEffi()
+void MCollArea::CalcEfficiency()
 { 
-  //  first of all calculate the efficency
-  //  do it here by hand to get the right error of efficency
- 
-  Int_t iBinx = ( (TAxis *) fHistSel->GetXaxis())->GetNbins() ; 
-  Int_t iBiny = ( (TAxis *) fHistSel->GetYaxis())->GetNbins() ; 
- 
-  Float_t N, Nall ; 
-  Double_t effi, error ; 
-  for (Int_t ix=1; ix<=iBiny; ix++ ) 
+    // Description!
+
+    //
+    //  first of all calculate the efficency
+    //  do it here by hand to get the right error of efficency
+    //
+    const Int_t iBinx = ((TAxis *)fHistSel->GetXaxis())->GetNbins();
+    const Int_t iBiny = ((TAxis *)fHistSel->GetYaxis())->GetNbins();
+
+    for (Int_t ix=1; ix<=iBiny; ix++ )
     {
-      for (Int_t iy=1; iy<=iBiny; iy++ ) 
-        { 
-          effi = error = 0. ; 
+        for (Int_t iy=1; iy<=iBiny; iy++ )
+        {
+            const Float_t N    = fHistSel->GetCellContent(ix, iy);
+            const Float_t Nall = fHistAll->GetCellContent(ix, iy);
 
-          N    = fHistSel->GetCellContent(ix, iy) ; 
-          Nall = fHistAll->GetCellContent(ix, iy) ; 
-          
-          if ( Nall > 0 ) { 
-            effi   = N / Nall ; 
-            error = sqrt ( Nall + Nall * N - N * N - N ) / (Nall * Nall ) ; 
+            if ( Nall <= 0 ) {
+                // cout << ix << " " << iy << endl ;
+                continue;
+            }
 
-            cout << ix << " " << iy 
-                 << " N " << N 
-                 << " Nall " << Nall
-                 << " effi  " << effi 
-                 << " error " << error 
-                 << endl ; 
+            const Double_t eff = N / Nall ;
+            const Double_t err = sqrt(Nall + Nall*N - N*N - N) / (Nall*Nall);
+            /*
+             cout << ix << " " << iy
+             << " N " << N
+             << " Nall " << Nall
+             << " effi  " << eff
+             << " error " << err
+             << endl ;
+             */
+            fHistSel->SetCellContent(ix, iy, eff);
+            fHistSel->SetCellError(ix, iy, err);
+        }
+    }
 
-            fHistSel->SetCellContent(ix, iy, effi) ; 
-            fHistSel->SetCellError(ix, iy, error) ; 
-          } 
-          else 
-            cout << ix << " " << iy << endl ; 
-            
-          
+    //
+    //  now calculate the Collection area for different
+    //  energies
+    //
+    for (Int_t ix=1; ix<=iBiny; ix++ )
+    {
+        Double_t errA = 0;
+        Double_t colA = 0;
 
-          
-        }
-    } 
-  
-  // 
-  //  now calculate the Collection area for different 
-  //  energies
-  //   
-  
-  
-  Double_t  r1, r2, eff, errEff, A, errA, collA ; 
+        for (Int_t iy=1; iy<=iBiny; iy++ )
+        {
+            const Double_t r1  = ((TAxis *)fHistSel->GetYaxis())->GetBinLowEdge(iy);
+            const Double_t r2  = ((TAxis *)fHistSel->GetYaxis())->GetBinLowEdge(iy+1);
 
-  for (Int_t ix=1; ix<=iBiny; ix++ ) 
-    {
-      A = errA = collA = errEff = 0. ; 
-      
-      for (Int_t iy=1; iy<=iBiny; iy++ ) 
-        { 
-          r1 = ( (TAxis *) fHistSel->GetYaxis())->GetBinLowEdge(iy) ; 
-          r2 = ( (TAxis *) fHistSel->GetYaxis())->GetBinLowEdge(iy+1) ; 
-          A  = 3.141592654 * ( r2*r2 - r1*r1 ) ; 
-          eff    = fHistSel->GetCellContent(ix, iy) ;
-          errEff = fHistSel->GetCellError(ix, iy) ; 
-          collA += eff * A ; 
-          
-          errA  += ( A * A ) * errEff * errEff ; 
-        }
+            const Double_t A   = kPI * (r2*r2 - r1*r1);
 
-      errA = sqrt( errA ) ; 
+            const Double_t eff = fHistSel->GetCellContent(ix, iy);
+            const Double_t err = fHistSel->GetCellError(ix, iy);
 
-      cout << ix << " --> " << A
-           << endl ; 
-      
-      fHistColl->SetBinContent(ix, collA ) ; 
-      fHistColl->SetBinError(ix, errA ) ; 
-      
+            colA += eff*A;
+            errA += (A*A) * err * err;
+        }
 
-    } 
-} 
+        fHistCol->SetBinContent(ix, colA);
+        fHistCol->SetBinError(ix, sqrt(errA));
+    }
+}

trunk/MagicSoft/Mars/mmontecarlo/MCollArea.h

@@ -9 +9 @@
 
  private: 
-  TH2D  *fHistAll ; //!    all simulated showers 
-  TH2D  *fHistSel ; //!    the selected showers
-  TH1D  *fHistColl ; //!   the collection area
+  TH2D  *fHistAll ; //! all simulated showers
+  TH2D  *fHistSel ; //! the selected showers
+  TH1D  *fHistCol ; //  the collection area
 
  public: 
@@ -23 +23 @@
   void DrawSel() ;
   void Draw(Option_t* option = "") ; 
-  void CalculateEffi() ; 
+  void CalcEfficiency() ;
 
   ClassDef(MCollArea, 1)  //  Data Container to calculate Collection Area