Changeset 698 for trunk/MagicSoft/Mars/mgui

Timestamp:

03/22/01 12:24:47 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mgui

Files:

• MCamDisplay.h (modified) (1 diff)
• MCamNeighbor.h (modified) (1 diff)
• MGDataCheckMain.cc (modified) (1 diff)
• MGDataCheckMain.h (modified) (1 diff)
• MGEventDispMain.h (modified) (1 diff)
• MGMarsMain.h (modified) (1 diff)
• MGMonteCarloMain.h (modified) (1 diff)
• MGPrototyp.h (modified) (1 diff)
• MGeomCamCT1.cc (modified) (1 diff)
• MHexagon.cc (modified) (1 diff)
• MHexagon.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mgui/MCamDisplay.h

@@ -73 +73 @@
     } 
 
-  ClassDef(MCamDisplay, 1) // Display the magic camera
+  ClassDef(MCamDisplay, 0) // Display the magic camera
 };
 

trunk/MagicSoft/Mars/mgui/MCamNeighbor.h

@@ -20 +20 @@
   void Print(Option_t *opt=NULL) ;
 
-  ClassDef(MCamNeighbor, 1) // Conatins the neighbors in the magic camera
+  ClassDef(MCamNeighbor, 0) // Conatins the neighbors in the magic camera
 } ; 
 

trunk/MagicSoft/Mars/mgui/MGDataCheckMain.cc

@@ -252 +252 @@
   if ( strcmp ( fInputFile, "\n") == 0 )
     { 
-      return ( kFALSE ) ; 
+      return kFALSE ;
     } 
   
-  return (kTRUE) ; 
+  return kTRUE ;
 } 
 

trunk/MagicSoft/Mars/mgui/MGDataCheckMain.h

@@ -86 +86 @@
   Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);
 
-  ClassDef(MGDataCheckMain, 1)
+  ClassDef(MGDataCheckMain, 0)
 
 } ; 

trunk/MagicSoft/Mars/mgui/MGEventDispMain.h

@@ -97 +97 @@
   Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);
 
-  ClassDef(MGEventDispMain, 1)
+  ClassDef(MGEventDispMain, 0)
 
 } ; 

trunk/MagicSoft/Mars/mgui/MGMarsMain.h

@@ -58 +58 @@
   Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);
 
-  ClassDef(MGMarsMain, 1)
+  ClassDef(MGMarsMain, 0)
 } ; 
 

trunk/MagicSoft/Mars/mgui/MGMonteCarloMain.h

@@ -81 +81 @@
   Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);
 
-  ClassDef(MGMonteCarloMain, 1)
+  ClassDef(MGMonteCarloMain, 0)
 
 } ; 

trunk/MagicSoft/Mars/mgui/MGPrototyp.h

@@ -93 +93 @@
   Bool_t ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2);
 
-  ClassDef(MGPrototyp, 1)
+  ClassDef(MGPrototyp, 0)
 
 } ; 

trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc

@@ -34 +34 @@
     // it was punt into a root/C++ context by Harald Kornmayer and Thomas Bretz
    
-    const Float_t pixdiameter = 21 ;    // units are cm
+    const Float_t diameter = 21 ;    // units are mm
+    const Float_t kS32  = sqrt(3)/2;
 
     //
     //  add the first pixel to the list
     //
-    (*this)[0].Set(0, 0, pixdiameter);
-    //fPixels->Add( new MGeomPix( ) ;
-
-    const Float_t kS32  = sqrt(3)/2;
-    const Float_t kPI23 = kPI*2/3;
-
     Int_t pixnum = 1;
 
-    for (Int_t ringcounter=1; ringcounter<7; ringcounter++) {
-        //
-        // calc. numofpix in ring number i first
-        //
-        const Int_t numpixthisring = ringcounter*6;
+    (*this)[pixnum++].Set(0, 0, diameter);
 
+    for (Int_t ring=1; ring<7; ring++)
+    {
         //
         // calc. coords for this ring counting from the
         // starting number to the ending number
         //
-        for (Int_t ipix = 0; ipix < numpixthisring; ipix++) {
+        for (int i=0; i<ring; i++)
+            (*this)[pixnum++].Set((-ring+i*0.5)*diameter,
+                                  i*kS32*diameter,
+                                  diameter);
 
-            Float_t ang     = 60.0/ringcounter * ipix;
-            Float_t fracang = ang - 60*(int)floor(ang/60);
+        for (int i=0; i<ring; i++)
+            (*this)[pixnum++].Set((-ring*0.5+i)*diameter,
+                                  ring*kS32 * diameter,
+                                  diameter);
 
-            ang     /= kRad2Deg;
-            fracang /= kRad2Deg;
+        for (int i=0; i<ring; i++)
+            (*this)[pixnum++].Set((ring+i)*0.5*diameter,
+                                  (ring-i)*kS32*diameter,
+                                  diameter);
 
-            Float_t rad  = pixdiameter * ringcounter;
-                    rad *= sin(kPI23-fracang) * kS32;
+        for (int i=0; i<ring; i++)
+            (*this)[pixnum++].Set((ring-0.5*i)*diameter,
+                                  -i*kS32*diameter,
+                                  diameter);
 
-            //
-            //   fill the Data into the array
-            //
+        for (int i=0; i<ring; i++)
+            (*this)[pixnum++].Set((ring*0.5-i)*diameter,
+                                  -ring*kS32 * diameter,
+                                  diameter);
 
-            (*this)[pixnum++].Set(rad * cos(ang),
-                                  rad * sin(ang),
-                                  pixdiameter);
-            // fPixels->Add( new MGeomPix( ) ;
-        }
+        for (int i=0; i<ring; i++)
+            (*this)[pixnum++].Set((-ring-i)*0.5*diameter,
+                                  (-ring+i)*kS32*diameter,
+                                  diameter);
     }
 }

trunk/MagicSoft/Mars/mgui/MHexagon.cc

@@ -92 +92 @@
 } 
 
-
-void MHexagon::Draw(Option_t *option ) 
-{ 
-  //   Draw this ellipse with its current attributes
-  AppendPad(option) ; 
-} 
-
-void MHexagon::DrawHexagon( Float_t x, Float_t y, Float_t d ) 
+void MHexagon::DrawHexagon( Float_t x, Float_t y, Float_t d )
 { 
   //   Draw this ellipse with new coordinate

trunk/MagicSoft/Mars/mgui/MHexagon.h

@@ -43 +43 @@
 
   virtual Int_t  DistancetoPrimitive(Int_t px, Int_t py ) ; 
-  virtual void   Draw( Option_t *Option="") ; 
   virtual void   DrawHexagon( Float_t x, Float_t y, Float_t d ) ; 
   
@@ -53 +52 @@
   virtual void   Print(Option_t *Option="") ;
 
-  ClassDef ( MHexagon, 1 )    //  a hexagon for MAGIC
+  ClassDef ( MHexagon, 0 )    //  a hexagon for MAGIC
 
 } ;