Index: trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx
===================================================================
--- trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx	(revision 2342)
+++ trunk/MagicSoft/Simulation/Detector/include-MTrigger/MTrigger.cxx	(revision 2373)
@@ -176,10 +176,10 @@
       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,5 +188,5 @@
   }
   else {
-    for (Int_t k=0; k<CAMERA_PIXELS; k++ ) {
+    for (Int_t k=0; k<pix; k++ ) {
       chan_thres[k] = threshold ; 
     }
@@ -277,5 +277,5 @@
   }  
   else { 
-    while ( i < CAMERA_PIXELS )
+    while ( i < pix )
       {
 	fscanf ( unit, " %d", &id ) ;
@@ -303,5 +303,5 @@
   }  
   else { 
-    while ( i < CAMERA_PIXELS )
+    while ( i < pix )
       {	
 	for ( Int_t k=0; k<TRIGGER_CELLS; k++ ) { 
@@ -313,5 +313,5 @@
 	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,5 +327,5 @@
   //
   
-  for ( i =0 ; i <CAMERA_PIXELS ; i++ ) { 
+  for ( i =0 ; i <pix ; i++ ) { 
     used [i] = FALSE ;
     dknt [i] = FALSE ;
@@ -511,12 +511,13 @@
   //
   
+#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