--- PamVMC/tof/src/PamVMCTofDig.cxx	2009/02/19 16:00:17	1.1
+++ PamVMC/tof/src/PamVMCTofDig.cxx	2010/02/23 12:09:40	1.6
@@ -27,7 +27,6 @@
   ThrowCalFileUsage("TOF",fquery.str().c_str());
   
   fcfile.open(fquery.str().c_str());
-  // fcfile.open("/opt/pamela-5.21/calib/tof-param/ToFCalibParam.txt");
 
   if(!fcfile) ThrowCalFileWarning("TOF"); else {
 
@@ -70,6 +69,7 @@
   const Int_t ADCsat=3100;       // saturation value for the ADCs
   const Int_t TDClast=4095;
 
+
   for(Int_t i =0; i<NP; i++){
     fQevePmt_pC[i]=ftdc[i]=ftdc1[i]=0.;
     ftdcpmt[i]=1000.;
@@ -85,10 +85,16 @@
     hc = 0;
   }
 
+  if(fDEBUG){
+    cout<<"Summarized values for ADC in PC:"<<endl;
+    for(Int_t i=0; i<NP; i++){
+      cout<<"PMT #"<<i<<" fQevePmt_pC="<<fQevePmt_pC[i]<<endl;
+    }
+  }
   //+++++ ADC +++++
 
   for(Int_t i=0; i<NP; i++){
-    if (fQevePmt_pC[i] < 800.)  
+    if (fQevePmt_pC[i] <= 800.)  
       fADCtof[i]= (Int_t)(ADC_pC0A + ADC_pC1A*fQevePmt_pC[i] 
 			  + ADC_pC2A*Power(fQevePmt_pC[i],2) 
 			  + ADC_pC3A*Power(fQevePmt_pC[i],3));
@@ -106,7 +112,15 @@
 
   // ======  TDC coincidence  ======
 
-  Float_t t_coinc = 0;
+
+  for(Int_t i=0; i<NP; i++) {
+    if((ftdcpmt[i] - fc1_S[i]) > 1e-7) {
+      ftdcpmt[i] = 0.;
+      ftdc[i] = 0.;
+    }
+  }// cycle to introduce a window for tdc
+
+  Double_t t_coinc = 0;
   Int_t ilast = 100;
   for (Int_t ii=0; ii<NP;ii++)
     if (ftdc[ii] > t_coinc) {
@@ -147,7 +161,14 @@
     fTDCint[i]= TDChelp[i];
   }
 
-
+  if (fDEBUG){
+    cout<<"====== TOF coincidence after... ======"<<endl;
+    for(Int_t i=0; i<NP; i++){
+      cout<<"PMT: "<<i<<" ADC: "<<fADCtof[i]<<" TDC: "
+	  <<fTDCint[i]<<endl;
+    }
+    cout<<"============================="<<endl;
+  }
   // ======  write DataTof  =======
 
   UChar_t Ctrl3bit[8]={32,0,96,64,160,128,224,192};  // DC (msb in 8 bit word )
@@ -174,6 +195,7 @@
       /* control bits inserted here, after the bin to gray conv - DC*/ 
       DataTof[jk12+6] = Ctrl3bit[2*k+1] | DataTof[jk12+6];
       tofBin=(UChar_t)(fTDCint[k+4*j]%256);   // TDC# (lsb)
+      //if(fDEBUG) cout<<" digit TDC: "<<jk12<<" TDC:"<<(Int_t)tofBin<<endl;
       DataTof[jk12+7]=Bin2GrayTof(tofBin,DataTof[jk12+7]);
     }
     DataTof[j12+20]=0x00;   // TEMP1
@@ -251,7 +273,8 @@
 
 Float_t PamVMCTofDig::TimeRes(Int_t PrimaryPDG){
 
-  Float_t time_res[8] = {425.,210.,170.,130.,120.,120.,120.,120.};
+  Float_t time_res[8] = {425.,210.,170.,130.,120.,120.,120.,120.}; 
+  for(Int_t i=0;i<8;i++) time_res[i]/=1.4;//1.17;1.5;1.3*/
   Int_t Z = Int_t((TDatabasePDG::Instance()->GetParticle(PrimaryPDG))->Charge()/3.);
     
   Float_t dt1 = 1.e-12*time_res[0];  // single PMT resolution for Z=1  (WM, Nov'07)
@@ -300,11 +323,12 @@
     t1=t2 = hit->GetTOF();
     padNo = hit->GetPOS()-1;
     pmtleft=pmtright=0;
-    if(planeNo==2)
+    if(planeNo==2){
       if(padNo==0)
 	padNo=1;
       else
 	padNo=0;
+    }
 
     Paddle2Pmt(planeNo,padNo, &pmtleft, &pmtright);
     
@@ -363,8 +387,8 @@
     // WM right and left <->    
     t1 += Abs(path[0]/veff0) + s_l_g[planeNo]/veff1;
     t2 += Abs(path[1]/veff0) + s_l_g[planeNo]/veff1;  // Signal reaches PMT
-    t1 = gRandom->Gaus(t1,TimeRes(PrimaryPDG)); //apply gaussian error  dt
-    t2 = gRandom->Gaus(t2,TimeRes(PrimaryPDG)); //apply gaussian error  dt
+    t1 = frandom->Gaus(t1,TimeRes(PrimaryPDG)); //apply gaussian error  dt
+    t2 = frandom->Gaus(t2,TimeRes(PrimaryPDG)); //apply gaussian error  dt
     t1 += fc1_S[pmtleft] ;  // Signal reaches Discriminator ,TDC starts  to run
     t2 += fc1_S[pmtright] ;
 
@@ -391,16 +415,14 @@
       if (ftdcpmt[pmtright] < 1000.)  // is already filled!
 	if (t2 <  ftdcpmt[pmtright]) {
 	  ftdcpmt[pmtright] = t2;
-	  t2+= fc2_S[pmtright] ;
+	  t2 += fc2_S[pmtright] ;
 	  ftdc[pmtright] = t2;
 	}
     }
     if(fDEBUG)cout<<"Time(s):"<<hit->GetTOF()<<" t1:"<<t1<<" t2:"<<t2<<endl
 		 <<"+++++  END OF TOF HIT +++++"<<endl;
-    
-  };
-  //END OF HIT COLLECTION LOOP
- 
+  }; 
+  //END OF HIT COLLECTION LOOP 
 }
 
 void PamVMCTofDig::Paddle2Pmt(Int_t planeNo, Int_t padNo, Int_t *pl, Int_t *pr){