--- calo/flight/CaloBragg/src/CaloBragg.cpp	2008/06/18 15:24:12	1.2
+++ calo/flight/CaloBragg/src/CaloBragg.cpp	2008/09/22 20:01:19	1.3
@@ -210,7 +210,7 @@
   
   /*z ed energia con loop*/
 //    cout<<"Zdaloop"<<endl;
-  Zdaloop(); // out:  1)chi2, 2)z, 3)Etot, 4)Pskip
+  //  Zdaloop(); // out:  1)chi2, 2)z, 3)Etot, 4)Pskip
 
 
   /*energia rilasciata da z migliore*/
@@ -629,15 +629,18 @@
 	badplane = 0.;//azzero contatore piani scartati consecutivi
       };
     };
-	  
-    if(badplane > 2) out[1] =79.;
+
+    if(badplane > 2){      
+      out[1] =79.;
+      break;
+    };  
 	  
   };//fine loop piani
   //chi2,frammentato,pskip  
   out[0]=sum;
   out[2]=badplanetot;
 
-  if(out[1] ==79.)cout<<"frammentato !!!!!"<<endl;
+//  if(out[1] ==79.)cout<<"frammentato !!!!!"<<endl;
   
 };//end chiquadro
 
@@ -705,14 +708,17 @@
 	matrixchi2[inucl][iene][0]=1000;//valore chi2 per questo z a questa energia
 	matrixchi2[inucl][iene][1]=1000;//energia per questo chi2
 	matrixchi2[inucl][iene][2]=1000;//piani saltati nel chi2
+	break;
       }
     }//fine loop energia
 
  
  };//fine loop z
 
-  for (Int_t nu=0; nu<colmax; nu++){
-    for (Int_t en=0; en<rowmax; en++){
+  //  for (Int_t nu=0; nu<colmax; nu++){
+  //    for (Int_t en=0; en<rowmax; en++){
+  for (Int_t nu=(int)(Zstart); nu<max; nu++){
+    for (Int_t en=0; en<1000; en++){
       if((matrixchi2[nu][en][0]<bestchi2[0]) && (matrixchi2[nu][en][0] !=0.)){
  	bestchi2[0]= matrixchi2[nu][en][0];// chi2
  	bestchi2[1]= (Float_t)nu; // z
@@ -722,13 +728,12 @@
     }
   }
   //==========================//
-  Int_t testz = (Int_t)bestchi2[1];
-
-  Enetrack(&testz, &bestchi2[2], &estremi[0][0],&estremi[1][0], dEplan);//calcola rilascio energetico sui piani
-  for(Int_t i=0;i<=estremi[1][0];i++){
-    cout<<"dEplan "<<dEplan[i]*10<<endl;
-    cout<<"calorimetro "<<calorimetro[i][1]<<endl;
-  }
+  //  Int_t testz = (Int_t)bestchi2[1];
+  //  Enetrack(&testz, &bestchi2[2], &estremi[0][0],&estremi[1][0], dEplan);//calcola rilascio energetico sui piani
+  //  for(Int_t i=0;i<=estremi[1][0];i++){
+   // cout<<"dEplan "<<dEplan[i]*10<<endl;
+   // cout<<"calorimetro "<<calorimetro[i][1]<<endl;
+  //  }
   //==========================//
 };//endloopze
 
@@ -757,7 +762,7 @@
 
     Long64_t work[200];
     Int_t ind = 0;
-    Int_t l = 0;
+    //    Int_t l = 0;
     Int_t RN = 0;
     Float_t sum4 = 0.;
     Float_t qm = 0.;
@@ -766,15 +771,15 @@
     //
     //Int_t uplim = TMath::Max(3,N);
     //
-    while ( l < 4 && ind < 44 ){
+    while ( RN < 4 && ind < 44 ){
       qm = TMath::KOrdStat(44,ordplane,ind,work);
       if (qm >= 0.7 ){	
-	if ( l < 4 ){
+	if ( RN < 4 ){
 	  sum4 += qm;
 	  RN++;
 	};
-	l++;
-	if ( debug ) printf(" value no %i qm %f sum4 %f \n",l,qm,sum4); 
+	//	l++;
+	//	if ( debug ) printf(" value no %i qm %f sum4 %f \n",l,qm,sum4); 
       };
       ind++;
     };
@@ -782,6 +787,9 @@
     sum4 /= (Float_t)RN;
     Float_t Zmean = (sqrt((sum4*MIP)/(4.*spessore[2])));
     if(Zmean ==0.) Zmean=1.;
+    if ( Zmean < 1. ) Zmean = 1.;
+    //
+    //    Zmean = 1.;
 
 //     cout<<"sum4="<<sum4<<endl;
 //     cout<<"Zmean="<<Zmean<<endl;
@@ -797,15 +805,15 @@
   bestchi2[3]=0.;
   Float_t zero=0.;
 
-  cout<<"inizio media troncata"<<endl;
-  cout<<"input: step "<<Integrale<<", zero "<<zero<<", zmin "<<zmin<<", zmax"<<zmin<<endl;
+ // cout<<"inizio media troncata"<<endl;
+ // cout<<"input: step "<<Integrale<<", zero "<<zero<<", zmin "<<zmin<<", zmax"<<zmin<<endl;
 
 
     //    step  energia   zstart  zstop  
   loopze(Integrale,zero,zmin,zmin);
   
-  cout<<"fine media troncata"<<endl;
-  cout<<"output: chi2 "<<bestchi2[0]<<", z"<<bestchi2[1]<<", Etot "<<bestchi2[2]<<", Pskip "<<bestchi2[3]<<endl;
+ // cout<<"fine media troncata"<<endl;
+ // cout<<"output: chi2 "<<bestchi2[0]<<", z"<<bestchi2[1]<<", Etot "<<bestchi2[2]<<", Pskip "<<bestchi2[3]<<endl;
 
 
 
@@ -846,13 +854,13 @@
   //primo loop   
   //     energia   ezero, zstart  zstop Si attrav  1 piano  energie piani  out 
 
-  cout<<"inizio primo loop"<<endl;
-  cout<<"input: step "<<Integrale<<", zero "<<zero<<", zmin "<<zmin<<", zmax"<<zmax<<endl;
+ // cout<<"inizio primo loop"<<endl;
+ // cout<<"input: step "<<Integrale<<", zero "<<zero<<", zmin "<<zmin<<", zmax"<<zmax<<endl;
 
   loopze(Integrale,zero,zmin,zmax);
 
-  cout<<"fine primo loop"<<endl;
-  cout<<"output: chi2 "<<bestchi2[0]<<", z"<<bestchi2[1]<<", Etot "<<bestchi2[2]<<", Pskip "<<bestchi2[3]<<endl;
+//  cout<<"fine primo loop"<<endl;
+//  cout<<"output: chi2 "<<bestchi2[0]<<", z"<<bestchi2[1]<<", Etot "<<bestchi2[2]<<", Pskip "<<bestchi2[3]<<endl;
   
   //secondo loop
   for(Int_t i=0;i<4;i++) bestchitemp[i]=bestchi2[i];
@@ -870,13 +878,13 @@
   if(zmin<1)zmin=1;
   zmax=bestchitemp[1]+1;//
 
-  cout<<"inizio secondo loop"<<endl;
-  cout<<"input: step "<<step<<", zero "<<zero<<", zmin "<<zmin<<", zmax"<<zmax<<endl;
+//  cout<<"inizio secondo loop"<<endl;
+//  cout<<"input: step "<<step<<", zero "<<zero<<", zmin "<<zmin<<", zmax"<<zmax<<endl;
 
   loopze(step,zero,zmin,zmax); //
 
-  cout<<"fine secondo loop"<<endl;
-  cout<<"output: chi2 "<<bestchi2[0]<<", z"<<bestchi2[1]<<", Etot "<<bestchi2[2]<<", Pskip "<<bestchi2[3]<<endl;
+//  cout<<"fine secondo loop"<<endl;
+//  cout<<"output: chi2 "<<bestchi2[0]<<", z"<<bestchi2[1]<<", Etot "<<bestchi2[2]<<", Pskip "<<bestchi2[3]<<endl;
 
 
 //   cout<<"z loop ok"<<endl;