Changeset 2362 for trunk/MagicSoft

Timestamp:

09/26/03 12:25:07 (21 years ago)

Author:

blanch

Message:

Modification to be able to read MGeomCam branch for any Geometry.

File:

• trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx (modified) (7 diffs)

trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx

@@ -21 +21 @@
 //
 // $RCSfile: camera.cxx,v $
-// $Revision: 1.61 $
+// $Revision: 1.62 $
 // $Author: blanch $ 
-// $Date: 2003-09-25 17:09:20 $
+// $Date: 2003-09-26 11:25:07 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -329 +329 @@
   char flag[SIZE_OF_FLAGS + 1];  //@< flags in the .rfl file
   char flag_new[SIZE_OF_FLAGS + 1];              //@< New flag for the run header in the .rfl file
+  char GeometryName[100][50];            //@< Name of MGeomCam for each CT
   int GeometryCamera[100];           //@< Identification of MGeomCam for each CT
   int TriggerPixels[100];           //@< Numeber of pixels in the trigger region for each CT
@@ -539 +540 @@
     switch(GeometryCamera[i]){
     case 1: camgeom[i]=new MGeomCamMagic;
+      strcpy(GeometryName[i],"MGeomCamMagic");
       TriggerPixels[i]=TRIGGER_PIXELS_1;
       break;
     case 2: camgeom[i]=new MGeomCamMagic919;
+      strcpy(GeometryName[i],"MGeomCamMagic919");
       TriggerPixels[i]=TRIGGER_PIXELS_2;
       break;
     case 3: camgeom[i]=new MGeomCamMagicHG;
+      strcpy(GeometryName[i],"MGeomCamMagicHG");
       TriggerPixels[i]=TRIGGER_PIXELS_3;
       break;
     case 5: camgeom[i]=new MGeomCamECO1000;
+      strcpy(GeometryName[i],"MGeomCamECO1000");
       TriggerPixels[i]=TRIGGER_PIXELS_5;
       break;
     case 6: camgeom[i]=new MGeomCamECO1000HG;
+      strcpy(GeometryName[i],"MGeomCamECO1000HG");
       TriggerPixels[i]=TRIGGER_PIXELS_6;
       break;
     case 8: camgeom[i]=new MGeomCamCT1;
+      strcpy(GeometryName[i],"MGeomCamCT1");
       TriggerPixels[i]=TRIGGER_PIXELS_8;
       break;
     case 9: camgeom[i]=new MGeomCamCT1Daniel;
+      strcpy(GeometryName[i],"MGeomCamCT1Daniel");
       TriggerPixels[i]=TRIGGER_PIXELS_9;
       break;
@@ -664 +672 @@
   for(Int_t ict=0;ict<ct_Number;ict++){
 
-    log(SIGNATURE,"\t%s : %i\n\t%20s:\t%i\n",
+    log(SIGNATURE,"\t%s : %i\n\t%20s:\t%s\n",
         "------- TELESCOPE ",ict+1,
-        "Geometry ", GeometryCamera[ict]);
+        "Geometry ", GeometryName[ict]);
     strcpy( qe_filename, get_qe_filename(ict));
 
@@ -990 +998 @@
   }
   if (ct_Number==1)
-    HeaderTree.Branch("MGeomCam","MGeomCam",
+    HeaderTree.Branch("MGeomCam",GeometryName[0],
                       &camdummy[0]);
   else{
@@ -999 +1007 @@
       strcat (branchname, & help[0]);
       strcat (branchname, ".");
-      HeaderTree.Branch(branchname,"MGeomCam", 
+      HeaderTree.Branch(branchname,GeometryName[ict], 
                         &camdummy[ict]);
     }
@@ -4046 +4054 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.61  2003/09/25 17:09:20  blanch
+// Bug on the number of phe from diffuse NSB fixed.
+//
 // Revision 1.60  2003/09/23 16:50:55  blanch
 // WE do not read ct_file anymore since all Telescope information is