--- calo/flight/FQLOOK/macros/FCaloQLOOK.cxx	2006/05/29 12:08:13	1.10
+++ calo/flight/FQLOOK/macros/FCaloQLOOK.cxx	2006/05/29 13:15:49	1.11
@@ -1,13 +1,13 @@
 //
 //   Check for possible errors and shows raw distribution of variables coming from the DSP (no calibrations needed) - Emiliano Mocchiutti
 //
-//   FCaloQLOOK.c      version 1.08  (2006-05-29)
+//   FCaloQLOOK.c      version 1.09  (2006-05-29)
 //
 //   The only input needed is the path to the directory created by YODA for the data file you want to analyze.
 //
 //   Changelog:
 //
-//   1.07 - 1.08 (2006-05-29): Fixed bug in output filename when input is not in the form DW_YYMMDD_NNN.
+//   1.07 - 1.09 (2006-05-29): Fixed bug in output filename when input is not in the form DW_YYMMDD_NNN. Bug in latchup alarm not coming from the status word, fixed.
 //
 //   1.06 - 1.07 (2006-05-23): Don't print warning in case of latchup not recognized from the status word, fixed. Added "expert" figures from 21 to 28 which appears only in the
 //                             case of latchup alarm.
@@ -281,7 +281,8 @@
   bool isRAW = 0;
   Int_t alldexy=0;
   Int_t alldexy2=0;
-  Int_t stri=0;
+  Int_t planebases=0;
+  //  Int_t stri=0;
   Int_t fcheck = 0;
   Int_t cestw=0;
   Int_t cmask = 127 ;
@@ -432,19 +433,32 @@
 	    bdone = 0;
 	    bl++;
 	    allbase = ce->base[l][ii][bl];
+	    //	    alldexy=0;
+	    //	    alldexy2=0;
+	    //	    stri=0;
+	    //	    for (Int_t e = 0; e < 16 ; e++ ){
+	    //	      stri = e + 16 * bl;
+	    //	      alldexy += (int)ce->dexyc[l][ii][stri];
+	    //	      alldexy2 += (int)ce->dexy[l][ii][stri];
+	    //	    };
+	  };
+	  //
+	  if ( kk == 0 ){
+	    planebases = 0;
 	    alldexy=0;
 	    alldexy2=0;
-	    stri=0;
-	    for (Int_t e = 0; e < 16 ; e++ ){
-	      stri = e + 16 * bl;
-	      alldexy += (int)ce->dexyc[l][ii][stri];
-	      alldexy2 += (int)ce->dexy[l][ii][stri];
+	    for (Int_t e = 0; e < 96 ; e++ ){
+	      if ( e < 6 ) planebases += (int)ce->base[l][ii][e];
+	      alldexy += (int)ce->dexyc[l][ii][e];
+	      alldexy2 += (int)ce->dexy[l][ii][e];
 	    };
 	  };
+	  //
 	  if ( !isRAW ) {
 	    //
 	    if ( !pdone ){
-	      if ( (ce->base[l][ii][bl]>32000 || ce->base[l][ii][bl] == 0 ) && ( alldexy > 512000 ||  alldexy == 0) && ce->perror[se] == 0 ) {
+	      //	      if ( (ce->base[l][ii][bl]>32000 || ce->base[l][ii][bl] == 0 ) && ( alldexy > 512000 ||  alldexy == 0) && ce->perror[se] == 0 ) {
+	      if ( (planebases>192000 || planebases == 0 ) && ( alldexy > 3072000 ||  alldexy == 0) && ce->perror[se] == 0 ) {
 		pdone = 1;
 		pshit[se][pl]++ ;
 		if ( (ce->stwerr[se] & (1 << 4)) == 0 ) {
@@ -512,7 +526,8 @@
 	    //
 	  } else {
 	    if ( !pdone ){
-	      if ( (alldexy2>512000 || alldexy2 == 0) && ce->perror[se] == 0 ) {
+	      if ( ( alldexy2 > 3072000 ||  alldexy2 == 0) && ce->perror[se] == 0 ) {
+		//	      if ( (alldexy2>512000 || alldexy2 == 0) && ce->perror[se] == 0 ) {
 		pdone = 1;
 		pshit[se][pl]++ ;			 
 		if ( (ce->stwerr[se] & (1 << 4)) == 0 ){