Changeset 700 for trunk

Timestamp:

03/22/01 12:57:54 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/CT1Hillas.C (modified) (2 diffs)
• macros/MagicHillas.C (added)
• macros/readCT1.C (modified) (2 diffs)
• macros/readMagic.C (added)
• mgui/MGeomCamCT1.cc (modified) (1 diff)

trunk/MagicSoft/Mars/macros/CT1Hillas.C

@@ -18 +18 @@
     // that you don't choos a wrong geometry by chance
     //
-    MGeomCamMagic camct1;
-    plist->AddToList(&camct1);
+    MGeomCamCT1 geomcam;
+    plist->AddToList(&geomcam);
 
     //
@@ -37 +37 @@
     //  4) fill the hillas into the histograms
     //
-    MCT1ReadAscii readct1("CT1_99_on1.dat") ;
+    MCT1ReadAscii read("CT1_99_on1.dat") ;
     MImgCleanStd  clean;
     MHillasCalc   hcalc;
     MFillHHillas  hfill;
 
-    tlist.AddToList(&readct1);
+    tlist.AddToList(&read);
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);

trunk/MagicSoft/Mars/macros/readCT1.C

@@ -3 +3 @@
     MParList plist;
 
-    MGeomCamCT1 camct1;
+    MGeomCamCT1 geomcam;
     MHillas     hillas;
     MTaskList   tlist;
 
-    plist->AddToList(&camct1);
+    plist->AddToList(&geomcam);
     plist->AddToList(&hillas);
     plist->AddToList(&tlist);
 
-    MCT1ReadAscii readct1("CT1_99_on1.dat") ;
+    MCT1ReadAscii read("CT1_99_on1.dat") ;
     MImgCleanStd  clean;
     MHillasCalc   hcalc;
 
-    tlist.AddToList(&readct1);
+    tlist.AddToList(&read);
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
@@ -28 +28 @@
 
     Int_t icount = 0 ;
-    MCamDisplay display(&camct1) ;
+    MCamDisplay display(&geomcam) ;
 
-    while (readct1.Process())
+    while (read.Process())
     {
         cout << "Event: " << icount++  << endl  ;

trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc

@@ -75 +75 @@
                                   diameter);
 
-        cout << pixnum << " " << ring << endl;
-
         for (int i=0; i<ring; i++)
             (*this)[pixnum++].Set((-ring-i)*0.5*diameter,