Changeset 2373 for trunk/MagicSoft/Simulation/Detector

Timestamp:

10/03/03 11:33:55 (21 years ago)

Author:

blanch

Message:

A define variable has been introduced to compile StarResponse ans global
variable CAMERA_PIXELS has been replaced by actual pixels in
MTrigger::MTrigger(int pix)

File:

• trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx (modified) (7 diffs)

trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx

@@ -176 +176 @@
       cout<<"WARNING: not able to read ..."<<input_thres<<endl;
       cout<<"Threshold will be set to "<<threshold<<" for all pixels"<<endl;
-      for (Int_t k=0; k<CAMERA_PIXELS; k++ ) {
+      for (Int_t k=0; k<pix; k++ ) {
         chan_thres[k] = threshold ; 
       }
     }
     else {
-      for (i=0;i<CAMERA_PIXELS;i++){
+      for (i=0;i<pix;i++){
         fscanf(unit_thres, "%f",&chan_thres[i]);
       }
@@ -188 +188 @@
   }
   else {
-    for (Int_t k=0; k<CAMERA_PIXELS; k++ ) {
+    for (Int_t k=0; k<pix; k++ ) {
       chan_thres[k] = threshold ; 
     }
@@ -277 +277 @@
   }  
   else { 
-    while ( i < CAMERA_PIXELS )
+    while ( i < pix )
       {
         fscanf ( unit, " %d", &id ) ;
@@ -303 +303 @@
   }  
   else { 
-    while ( i < CAMERA_PIXELS )
+    while ( i < pix )
       { 
         for ( Int_t k=0; k<TRIGGER_CELLS; k++ ) { 
@@ -313 +313 @@
         for ( Int_t k=0; k<TRIGGER_CELLS; k++ ) { 
           fscanf ( unit, "%d ", &i ) ;
-          if ((i-1)<CAMERA_PIXELS)
+          if ((i-1)<pix)
             TC[k][i-1]=TRUE;
         }
@@ -327 +327 @@
   //
   
-  for ( i =0 ; i <CAMERA_PIXELS ; i++ ) { 
+  for ( i =0 ; i <pix ; i++ ) { 
     used [i] = FALSE ;
     dknt [i] = FALSE ;
@@ -511 +511 @@
   //
   
+#ifndef __STARRESPO__
   for(i=0; i < pixnum;i++ )
     {
       MGeomPix &pixel = (*camgeom)[i];
       for ( Int_t k=0; k<6; k++ ) { 
-        NN[k][i]=pixel.GetNeighbor(k);
-        }
-    }
-
+        NN[k][i]=pixel.GetNeighbor(k);
+      }
+    }
+#endif
   //
   //  Read in the lookup table for trigger cells