X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSOnlineSDDInjectors.cxx;h=531bad0bf1e1b1498018f387f217ad933d3ae523;hb=1ff86ea91d3353ca2c446a24cbcfc40681f1e64a;hp=135d074733d3089326bdc7284ea4ba472917dcc4;hpb=06bb3583e3e9db7234eddd67146703047a858775;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSOnlineSDDInjectors.cxx b/ITS/AliITSOnlineSDDInjectors.cxx
index 135d074733d..531bad0bf1e 100644
--- a/ITS/AliITSOnlineSDDInjectors.cxx
+++ b/ITS/AliITSOnlineSDDInjectors.cxx
@@ -12,10 +12,14 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
+#include <TFile.h>
 #include "AliITSOnlineSDDInjectors.h"
+#include "AliLog.h"
 #include <TH2F.h>
+#include <TF1.h>
 #include <TGraphErrors.h>
 #include <TMath.h>
+#include <TString.h>
 
 /* $Id$ */
 
@@ -29,28 +33,83 @@
 ClassImp(AliITSOnlineSDDInjectors)
 
 const Float_t AliITSOnlineSDDInjectors::fgkSaturation = 1008.;
-const Float_t AliITSOnlineSDDInjectors::fgkDefaultLThreshold = 5.;
-const Float_t AliITSOnlineSDDInjectors::fgkDefaultHThreshold = 25.;
+const Float_t AliITSOnlineSDDInjectors::fgkDefaultLThreshold1 = 8.;
+const Float_t AliITSOnlineSDDInjectors::fgkDefaultLThreshold = 15.;
+const Float_t AliITSOnlineSDDInjectors::fgkDefaultHThreshold1 =15.;
+const Float_t AliITSOnlineSDDInjectors::fgkDefaultHThreshold = 30.;
 const Float_t AliITSOnlineSDDInjectors::fgkDefaultMinSpeed = 5.5;
 const Float_t AliITSOnlineSDDInjectors::fgkDefaultMaxSpeed = 9.0;
 const Float_t AliITSOnlineSDDInjectors::fgkDefaultMaxErr = 1.5;
-const Int_t   AliITSOnlineSDDInjectors::fgkDefaultPolOrder = 3;
-const UShort_t AliITSOnlineSDDInjectors::fgkDefaultTbMin[kInjLines] = {20,90,170};
-const UShort_t AliITSOnlineSDDInjectors::fgkDefaultTbMax[kInjLines] = {50,160,240};
+const Int_t   AliITSOnlineSDDInjectors::fgkDefaultPolDegree = 3;
+const Float_t AliITSOnlineSDDInjectors::fgkDefaultTimeStep = 50.;
+const UShort_t AliITSOnlineSDDInjectors::fgkDefaultTbMin[kInjLines] = {10,50,100};
+const UShort_t AliITSOnlineSDDInjectors::fgkDefaultTbMax[kInjLines] = {20,70,120};
 
 //______________________________________________________________________
-AliITSOnlineSDDInjectors::AliITSOnlineSDDInjectors():AliITSOnlineSDD(),fHisto(),fTbZero(0.),fParam(),fPolOrder(0),fMinDriftSpeed(0.),fMaxDriftSpeed(0.),fMaxDriftSpeedErr(0.),fLowThreshold(0.),fHighThreshold(0.),fFirstPadForFit(0),fLastPadForFit(0),fPadStatusCutForFit(0)
+AliITSOnlineSDDInjectors::AliITSOnlineSDDInjectors():
+  AliITSOnlineSDD(),
+  fHisto(),
+  fTbZero(0.),
+  fRMSTbZero(0.),
+  fNEvents(0),
+  fParam(),
+  fPolDegree(0),
+  fActualPolDegree(0),
+  fMinDriftSpeed(0.),
+  fMaxDriftSpeed(0.),
+  fMaxDriftSpeedErr(0.),
+  fFirstPadForFit(0),
+  fLastPadForFit(0),
+  fPadStatusCutForFit(0),
+  fTimeStep(0.),
+  fUseTimeZeroSignal(kFALSE),
+  fMaxCellsAboveThreshold(40)
 {
   // default constructor
   SetPositions();
   SetDefaults();
+  SetTimeStep(fgkDefaultTimeStep);
+  for(Int_t i=0;i<kInjPads;i++){ 
+    fSumDriftSpeed[i]=0.;
+    fSumSqDriftSpeed[i]=0.;
+    fSumPadStatus[i]=0;
+    fSumPadStatusCut[i]=0;
+    fNEventsInPad[i]=0;
+  }
+  Reset();
 }
 //______________________________________________________________________
-AliITSOnlineSDDInjectors::AliITSOnlineSDDInjectors(Int_t nddl, Int_t ncarlos, Int_t sid):AliITSOnlineSDD(nddl,ncarlos,sid),fHisto(),fTbZero(0.),fParam(),fPolOrder(0),fMinDriftSpeed(0.),fMaxDriftSpeed(0.),fMaxDriftSpeedErr(0.),fLowThreshold(0.),fHighThreshold(0.),fFirstPadForFit(0),fLastPadForFit(0),fPadStatusCutForFit(0)
+AliITSOnlineSDDInjectors::AliITSOnlineSDDInjectors(Int_t nddl, Int_t ncarlos, Int_t sid):
+  AliITSOnlineSDD(nddl,ncarlos,sid),
+  fHisto(),
+  fTbZero(0.),
+  fRMSTbZero(0.),
+  fNEvents(0),
+  fParam(),
+  fPolDegree(0),
+  fActualPolDegree(0),
+  fMinDriftSpeed(0.),
+  fMaxDriftSpeed(0.),
+  fMaxDriftSpeedErr(0.),
+  fFirstPadForFit(0),
+  fLastPadForFit(0),
+  fPadStatusCutForFit(0),
+  fTimeStep(0.),
+  fUseTimeZeroSignal(kFALSE),
+  fMaxCellsAboveThreshold(40)
 { 
 // standard constructor
   SetPositions();
   SetDefaults();
+  SetTimeStep(fgkDefaultTimeStep);
+  for(Int_t i=0;i<kInjPads;i++){ 
+    fSumDriftSpeed[i]=0.;
+    fSumSqDriftSpeed[i]=0.;
+    fSumPadStatus[i]=0;
+    fSumPadStatusCut[i]=0;
+    fNEventsInPad[i]=0;
+  }
+  Reset();
 }
 //______________________________________________________________________
 AliITSOnlineSDDInjectors::~AliITSOnlineSDDInjectors(){
@@ -62,10 +121,14 @@ AliITSOnlineSDDInjectors::~AliITSOnlineSDDInjectors(){
 }
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::SetDefaults(){
-  for(Int_t i=0;i<kInjLines;i++) 
+  // Sets default values for parameters
+  for(Int_t i=0;i<kInjLines;i++) {
     SetInjLineRange(i,fgkDefaultTbMin[i],fgkDefaultTbMax[i]);
-  SetThresholds(fgkDefaultLThreshold,fgkDefaultHThreshold);
-  SetPolOrder(fgkDefaultPolOrder);
+    SetUseLine(i,kTRUE);
+    SetThresholds(i,fgkDefaultLThreshold,fgkDefaultHThreshold);
+  }
+  SetThresholds(0,fgkDefaultLThreshold1,fgkDefaultHThreshold1);
+  SetPolDegree(fgkDefaultPolDegree);
   SetMinDriftSpeed(fgkDefaultMinSpeed);
   SetMaxDriftSpeed(fgkDefaultMaxSpeed);
   SetMaxDriftSpeedErr(fgkDefaultMaxErr);
@@ -73,10 +136,28 @@ void AliITSOnlineSDDInjectors::SetDefaults(){
   SetPadStatusCutForFit();
 }
 //______________________________________________________________________
+void AliITSOnlineSDDInjectors::Set20MHzConfig(){
+  // Sets specific parameters for 20 MHz running
+  SetInjLineRange(0,10,20);
+  SetInjLineRange(1,50,70);
+  SetInjLineRange(2,100,120);
+  SetTimeStep(50.);
+  SetMaxNumberOfCellsPerAnode(40);
+}
+//______________________________________________________________________
+void AliITSOnlineSDDInjectors::Set40MHzConfig(){
+  // Sets specific parameters for 20 MHz running
+  SetInjLineRange(0,20,50);
+  SetInjLineRange(1,90,160);
+  SetInjLineRange(2,170,240);
+  SetTimeStep(25.);
+  SetMaxNumberOfCellsPerAnode(80);
+}
+//______________________________________________________________________
 void AliITSOnlineSDDInjectors::SetPositions(){
-  // 
-  Float_t xLinFromCenterUm[kInjLines]={31860.,17460.,660.};
-  Float_t xAnodeFromCenterUm=35085;
+  // Sets drift distances for the 3 injector lines
+  Double_t xLinFromCenterUm[kInjLines]={31860.,17460.,660.};
+  Double_t xAnodeFromCenterUm=35085;
   for(Int_t i=0;i<kInjLines;i++){
     fPosition[i]=xAnodeFromCenterUm-xLinFromCenterUm[i];
     fPosition[i]/=10000.; // from microns to cm
@@ -84,7 +165,7 @@ void AliITSOnlineSDDInjectors::SetPositions(){
 }
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::Reset(){
-  //
+  // Resets all counters
   for(Int_t i=0;i<kInjPads;i++){ 
     fDriftSpeed[i]=0.;
     fDriftSpeedErr[i]=0.;
@@ -99,18 +180,74 @@ void AliITSOnlineSDDInjectors::Reset(){
 }
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::AnalyzeEvent(TH2F* his){
-  //
+  // Analyze the current event
+  AddEvent(his);
+  FitDriftSpeedVsAnode();
+}
+//______________________________________________________________________
+void AliITSOnlineSDDInjectors::AddEvent(TH2F* his){
+  // Add the drift speed from current event to the average value
+  if(fNEvents==0){
+    for(Int_t i=0;i<kInjPads;i++){ 
+      fSumDriftSpeed[i]=0.;
+      fSumSqDriftSpeed[i]=0.;
+      fSumPadStatus[i]=0;
+      fSumPadStatusCut[i]=0;
+      fNEventsInPad[i]=0;
+    }
+  }
   Reset();
   fHisto=his;
   FindGoodInjectors();
   FindCentroids();
   CalcTimeBinZero();
-  for(Int_t j=0;j<kInjPads;j++) CalcDriftSpeed(j);
+  for(Int_t j=0;j<kInjPads;j++){ 
+    CalcDriftSpeed(j);
+    Int_t padStatus=GetInjPadStatus(j);
+    fSumPadStatus[j]+=padStatus;
+    if(padStatus>fPadStatusCutForFit){
+      fSumDriftSpeed[j]+=fDriftSpeed[j];
+      fSumSqDriftSpeed[j]+=fDriftSpeed[j]*fDriftSpeed[j];
+      fSumPadStatusCut[j]+=padStatus;
+      fNEventsInPad[j]++;
+    }
+  }
+  ++fNEvents;
+}
+//______________________________________________________________________
+Double_t AliITSOnlineSDDInjectors::GetRMSDriftSpeed(Int_t ipad) const {
+  // Compute RMS of drift speed distribution on one anode
+  if(fNEventsInPad[ipad]<=1) return 0.;
+  Double_t mean=fSumDriftSpeed[ipad]/(Double_t)fNEventsInPad[ipad];
+  Double_t diff=fSumSqDriftSpeed[ipad]/(Double_t)fNEventsInPad[ipad]-mean*mean;
+  if(diff<0.) diff=0.;
+  return TMath::Sqrt(diff);
+}
+
+//______________________________________________________________________
+void AliITSOnlineSDDInjectors::FitMeanDriftSpeedVsAnode(){
+  // Fits the average drift speed vs.anode number
+  if(fNEvents==0) return;
+  for(Int_t i=0;i<kInjPads;i++){ 
+    fDriftSpeed[i]=GetMeanDriftSpeed(i);
+    Int_t padStatusCut=(Int_t)(GetMeanPadStatusCut(i)+0.5);
+    for(Int_t ilin=0; ilin<kInjLines ; ilin++) fGoodInj[i][ilin]=(padStatusCut&1<<ilin)>>ilin;
+    if(fNEventsInPad[i]>1){
+      Double_t rms=GetRMSDriftSpeed(i);
+      if(rms>0.) fDriftSpeedErr[i]=rms/TMath::Sqrt(fNEventsInPad[i]);
+    }else{
+      for(Int_t ilin=0; ilin<kInjLines ; ilin++) fGoodInj[i][ilin]=0;
+    }
+  }
   FitDriftSpeedVsAnode();
+  for(Int_t i=0;i<kInjPads;i++){ 
+    Int_t padStatus=(Int_t)(GetMeanPadStatusCut(i)+0.5);
+    for(Int_t ilin=0; ilin<kInjLines ; ilin++) fGoodInj[i][ilin]=(padStatus&1<<ilin)>>ilin;
+  }
 }
 //______________________________________________________________________
 TGraphErrors* AliITSOnlineSDDInjectors::GetTimeVsDistGraph(Int_t jpad) const{
-  // 
+  // Builds the graph of drift time vs. drift distance
   const Int_t kPts=kInjLines+1;
   Float_t x[kPts],y[kPts],ex[kPts],ey[kPts];
   x[0]=0.;
@@ -129,7 +266,7 @@ TGraphErrors* AliITSOnlineSDDInjectors::GetTimeVsDistGraph(Int_t jpad) const{
 
 //______________________________________________________________________
 TGraphErrors* AliITSOnlineSDDInjectors::GetDriftSpeedGraph() const{
-  // 
+  // Builds the graph of drift speed vs. anode number
   Int_t ipt=0;
   TGraphErrors *g=new TGraphErrors(0);
   for(Int_t i=0;i<kInjPads;i++){
@@ -158,26 +295,93 @@ TGraphErrors* AliITSOnlineSDDInjectors::GetSelectedDriftSpeedGraph(Int_t minAcce
 }
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::CalcTimeBinZero(){
-  //
-  Float_t tzero=0.,intCont=0.;
+  // Get time zero from trigger signal
+  Double_t tzero=0.,intCont=0.,rmsPeak=0.;
+  Bool_t isTbUsed[256];
+  Int_t nTbUsed=0;
+  for(Int_t i=0;i<256;i++) isTbUsed[i]=0;
   for(Int_t ian=0;ian<fgkNAnodes;ian++){
     for(Int_t itb=1;itb<fTbMin[0];itb++){
-      Float_t cont=fHisto->GetBinContent(itb,ian+1);
-      if(cont>fLowThreshold){
-	tzero+=cont*float(itb);
-	intCont+=cont;
+      Double_t cont=fHisto->GetBinContent(itb,ian+1);
+      Double_t contm1=fHisto->GetBinContent(itb+1,ian+1);
+      Double_t contp1=fHisto->GetBinContent(itb-1,ian+1);
+      if(cont>fLowThreshold[0]){
+	if(cont>fHighThreshold[0] &&(contm1>fLowThreshold[0] || contp1>fLowThreshold[0])){
+	  tzero+=cont*float(itb);
+	  rmsPeak+=cont*float(itb)*float(itb);
+	  intCont+=cont;
+	  if(!isTbUsed[itb]){
+	    isTbUsed[itb]=1;
+	    ++nTbUsed;
+	  }
+	}
       }
     }
   }
-  if(intCont>0) fTbZero=tzero/intCont;
+  if(intCont>0){ 
+    fTbZero=tzero/intCont;
+    fRMSTbZero=TMath::Sqrt(rmsPeak/intCont-fTbZero*fTbZero);
+  }
+  if(nTbUsed==1) fRMSTbZero=0.5; 
 }
+
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::FitDriftSpeedVsAnode(){
+  // fits the anode dependence of drift speed
+
+  Float_t rangeForMax[2]={78.,178.};
+  PolyFit(fPolDegree);
+  fActualPolDegree=fPolDegree;
+  if(fPolDegree==3){
+    Double_t deltasq=fParam[2]*fParam[2]-3*fParam[1]*fParam[3];
+    Double_t zero1=-999.;
+    Double_t zero2=-999.;
+    if(deltasq>=0. && TMath::Abs(fParam[3])>0.){
+      Double_t delta=TMath::Sqrt(deltasq);
+      zero1=(-fParam[2]+delta)/3./fParam[3];
+      zero2=(-fParam[2]-delta)/3./fParam[3];
+    }
+    Bool_t twoZeroes=kFALSE;
+    Bool_t oneZero=kFALSE;
+    if(zero1>0. && zero1<256. && zero2>0. && zero2<256.) twoZeroes=kTRUE;
+    if(zero1>rangeForMax[0] && zero1<rangeForMax[1]) oneZero=kTRUE;
+    if(zero2>rangeForMax[0] && zero2<rangeForMax[1]) oneZero=kTRUE;
+    if(!oneZero || twoZeroes){
+      PolyFit(2);
+      Double_t xmax=-999.;
+      if(fParam[2]<0.) xmax=-fParam[1]/2./fParam[2];
+      if(xmax>rangeForMax[0] && xmax<rangeForMax[1]){
+	fActualPolDegree=2;
+      }else{
+	Double_t averSpeed=0.;
+	Double_t sumWei=0.;
+	Int_t nUsedPts=0;
+	for(Int_t jpad=fFirstPadForFit; jpad<=fLastPadForFit; jpad++){
+	  if(fDriftSpeed[jpad]>0 && GetInjPadStatus(jpad)>fPadStatusCutForFit){
+	    Double_t wei=1./fDriftSpeedErr[jpad]/fDriftSpeedErr[jpad];
+	    averSpeed+=wei*fDriftSpeed[jpad];
+	    sumWei+=wei;
+	    nUsedPts++;
+	  }
+	}
+	if(sumWei>0.) averSpeed/=sumWei;
+	if(nUsedPts<fPolDegree+1) averSpeed=0;
+	fParam[0]=averSpeed;
+	for(Int_t i=1; i < fPolDegree+1; i++) fParam[i]=0.;
+	fActualPolDegree=0;
+      }
+    }
+  }
+}
+//______________________________________________________________________
+void AliITSOnlineSDDInjectors::PolyFit(Int_t degree){
   // fits the anode dependence of drift speed with a polynomial function
-  const Int_t kNn=fPolOrder+1;
-  Float_t **mat = new Float_t*[kNn];
-  for(Int_t i=0; i < kNn; i++) mat[i] = new Float_t[kNn];
-  Float_t *vect = new Float_t[kNn];
+  const Int_t kNn=degree+1;
+  const Int_t kDimens=fPolDegree+1;
+
+  Double_t **mat = new Double_t*[kNn];
+  for(Int_t i=0; i < kNn; i++) mat[i] = new Double_t[kNn];
+  Double_t *vect = new Double_t[kNn];
 
   for(Int_t k1=0;k1<kNn;k1++){
     vect[k1]=0;
@@ -188,20 +392,20 @@ void AliITSOnlineSDDInjectors::FitDriftSpeedVsAnode(){
   Int_t npts = 0;
   for(Int_t k1=0;k1<kNn;k1++){
     for(Int_t jpad=fFirstPadForFit; jpad<=fLastPadForFit; jpad++){
-      Float_t x=(Float_t)GetAnodeNumber(jpad);
+      Double_t x=(Double_t)GetAnodeNumber(jpad);
       if(fDriftSpeed[jpad]>0 && GetInjPadStatus(jpad)>fPadStatusCutForFit){
-	  vect[k1]+=fDriftSpeed[jpad]*TMath::Power(x,k1)/TMath::Power(fDriftSpeedErr[jpad],2);	
-	  if(k1==0) npts++;
-	  for(Int_t k2=0;k2<kNn;k2++){
-	    mat[k1][k2]+=TMath::Power(x,k1+k2)/TMath::Power(fDriftSpeedErr[jpad],2);
-	  }
+	vect[k1]+=fDriftSpeed[jpad]*TMath::Power(x,k1)/TMath::Power(fDriftSpeedErr[jpad],2);	
+	if(k1==0) npts++;
+	for(Int_t k2=0;k2<kNn;k2++){
+	  mat[k1][k2]+=TMath::Power(x,k1+k2)/TMath::Power(fDriftSpeedErr[jpad],2);
+	}
       }
     }
   }
-  if(npts<fPolOrder+1){ 
+  if(npts<fPolDegree+1){ 
     if(fParam) delete [] fParam;
-    fParam=new Float_t[kNn];
-    for(Int_t i=0; i<kNn;i++)fParam[i]=0;
+    fParam=new Double_t[kDimens];
+    for(Int_t i=0; i<kDimens;i++)fParam[i]=0;
   }else{
     Int_t *iPivot = new Int_t[kNn];
     Int_t *indxR = new Int_t[kNn];
@@ -209,7 +413,7 @@ void AliITSOnlineSDDInjectors::FitDriftSpeedVsAnode(){
     for(Int_t i=0;i<kNn;i++) iPivot[i]=0;
     Int_t iCol=-1,iRow=-1;
     for(Int_t i=0;i<kNn;i++){
-      Float_t big=0.;
+      Double_t big=0.;
       for(Int_t j=0;j<kNn;j++){
 	if(iPivot[j]!=1){
 	  for(Int_t k=0;k<kNn;k++){
@@ -224,7 +428,7 @@ void AliITSOnlineSDDInjectors::FitDriftSpeedVsAnode(){
 	}
       }
       iPivot[iCol]++;
-      Float_t aux;
+      Double_t aux;
       if(iRow!=iCol){
 	for(Int_t l=0;l<kNn;l++){
 	  aux=mat[iRow][l];
@@ -238,7 +442,7 @@ void AliITSOnlineSDDInjectors::FitDriftSpeedVsAnode(){
       indxR[i]=iRow;
       indxC[i]=iCol;
       if(mat[iCol][iCol]==0) break;
-      Float_t pivinv=1./mat[iCol][iCol];
+      Double_t pivinv=1./mat[iCol][iCol];
       mat[iCol][iCol]=1;
       for(Int_t l=0;l<kNn;l++) mat[iCol][l]*=pivinv;
       vect[iCol]*=pivinv;
@@ -257,8 +461,9 @@ void AliITSOnlineSDDInjectors::FitDriftSpeedVsAnode(){
     
   
     if(fParam) delete [] fParam;
-    fParam=new Float_t[kNn];
+    fParam=new Double_t[kDimens];
     for(Int_t i=0; i<kNn;i++)fParam[i]=vect[i];
+    if(degree<fPolDegree) for(Int_t i=kNn; i<kDimens;i++)fParam[i]=0.;
   }
 
   for(Int_t i=0; i < kNn; i++) delete [] mat[i];
@@ -267,16 +472,17 @@ void AliITSOnlineSDDInjectors::FitDriftSpeedVsAnode(){
 }
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::CalcDriftSpeed(Int_t jpad){
-  // 
-  Float_t sumY=0,sumX=0,sumXX=0,sumYY=0.,sumXY=0,sumWEI=0.;
+  // Computes the drift speed from the fit to the 3 injector lines for each anode
+  Double_t sumY=0,sumX=0,sumXX=0,sumYY=0.,sumXY=0,sumWEI=0.;
   Int_t npt=0;
-  Float_t y[kInjLines],ey[kInjLines];
-  Float_t tzero=0,erry=0;
+  Double_t y[kInjLines],ey[kInjLines];
+  Double_t tzero=0,erry=0;
   for(Int_t i=0;i<kInjLines;i++){ 
     y[i]=fCentroid[jpad][i];
     ey[i]=fRMSCentroid[jpad][i];
   }
   for(Int_t i=0;i<kInjLines;i++){
+    if(!fUseLine[i]) continue;
     if(fGoodInj[jpad][i] && ey[i]!=0){
       sumY+=y[i]/ey[i]/ey[i];
       sumX+=fPosition[i]/ey[i]/ey[i];
@@ -285,26 +491,32 @@ void AliITSOnlineSDDInjectors::CalcDriftSpeed(Int_t jpad){
       sumXY+=fPosition[i]*y[i]/ey[i]/ey[i];
       sumWEI+=1./ey[i]/ey[i];
       tzero=fTbZero/ey[i]/ey[i];
-      erry=ey[i];
+      erry=ey[i]/ey[i]/ey[i];
       npt++;
     }
   }
-  Float_t vel=0,evel=0;
+  Double_t slope=0.,eslope=0.;
+  if(npt==1){
+    slope=(sumY-tzero)/sumX;
+    eslope=erry/sumX;
+  }
   if(npt>1){ 
-    Float_t slope=(sumWEI*sumXY-sumY*sumX)/(sumWEI*sumXX-sumX*sumX);
-    Float_t eslope=TMath::Sqrt(sumWEI/(sumWEI*sumXX-sumX*sumX));
-    if(slope!=0){
-      vel=1./slope*10000./25.;// micron/ns
-      evel=eslope/slope/slope*10000./25.;// micron/ns
+    if(fUseTimeZeroSignal){
+      sumY+=fTbZero/fRMSTbZero/fRMSTbZero;
+      sumX+=0.;
+      sumXX+=0.;
+      sumYY+=fTbZero*fTbZero/fRMSTbZero/fRMSTbZero;
+      sumXY+=0.;
+      sumWEI+=1./fRMSTbZero/fRMSTbZero;
     }
+    slope=(sumWEI*sumXY-sumY*sumX)/(sumWEI*sumXX-sumX*sumX);
+    eslope=TMath::Sqrt(sumWEI/(sumWEI*sumXX-sumX*sumX));
   }
-  if(npt==1){
-    Float_t slope=(sumY-tzero)/sumX;
-    Float_t eslope=erry/sumX;
-    if(slope!=0){
-      vel=1./slope*10000./25.;// micron/ns    
-      evel=eslope/slope/slope*10000./25.;// micron/ns
-    }
+
+  Double_t vel=0,evel=0;
+  if(slope!=0. && fTimeStep>0.){
+    vel=1./slope*10000./fTimeStep;// micron/ns
+    evel=eslope/slope/slope*10000./fTimeStep;// micron/ns
   }
   if(vel>fMaxDriftSpeed||vel<fMinDriftSpeed || evel>fMaxDriftSpeedErr){ 
     vel=0.;
@@ -331,7 +543,7 @@ Int_t AliITSOnlineSDDInjectors::GetAnodeNumber(Int_t iInjPad) const{
 }
 //______________________________________________________________________
 Int_t AliITSOnlineSDDInjectors::GetInjPadNumberFromAnode(Int_t nAnode) const{
-  //
+  // Converts anode number into injector pad index
   Int_t iInjPad=-1;
   if(fSide==1){  // right side
     if(nAnode%8==0) iInjPad=nAnode/8;
@@ -359,17 +571,29 @@ Int_t AliITSOnlineSDDInjectors::GetInjPadStatus(Int_t jpad) const{
 }
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::FindGoodInjectors(){
-  // 
+  // Mark good injector pads
+  // good = 1 cell above high threshold + 1 neighbour above low threshold
   for(Int_t jpad=0;jpad<kInjPads;jpad++){
     Int_t ian=GetAnodeNumber(jpad);
-    for(Int_t jlin=0;jlin<kInjLines;jlin++){
-      for(Int_t jjj=fTbMin[jlin];jjj<fTbMax[jlin];jjj++){
-	Float_t c1=fHisto->GetBinContent(jjj,ian+1);
-	Float_t c2=fHisto->GetBinContent(jjj+1,ian+1);
-	Float_t c3=fHisto->GetBinContent(jjj+2,ian+1);
-	if(c1>fLowThreshold && c2>fHighThreshold && c3>fLowThreshold){ 
-	  fGoodInj[jpad][jlin]=1;
-	  break;
+    Int_t countAbove=0;
+    for(Int_t jjj=0; jjj<fHisto->GetNbinsX(); jjj++){
+      Float_t c=fHisto->GetBinContent(jjj+1,ian+1);
+      if(c>0.5) countAbove++;
+    }
+    if(countAbove>fMaxCellsAboveThreshold){
+      for(Int_t jlin=0;jlin<kInjLines;jlin++) fGoodInj[jpad][jlin]=0;           
+    }else{
+      for(Int_t jlin=0;jlin<kInjLines;jlin++){
+	for(Int_t jjj=fTbMin[jlin];jjj<fTbMax[jlin];jjj++){
+	  Float_t c1=fHisto->GetBinContent(jjj,ian+1);
+	  Float_t c2=fHisto->GetBinContent(jjj+1,ian+1);
+	  //	Float_t c3=fHisto->GetBinContent(jjj+2,ian+1);
+	  if(c1>fLowThreshold[jlin] && c2>fLowThreshold[jlin]){ 
+	    if(c1>fHighThreshold[jlin] || c2>fHighThreshold[jlin]){
+	      fGoodInj[jpad][jlin]=1;
+	      break;
+	    }
+	  }
 	}
       }
     }
@@ -377,46 +601,46 @@ void AliITSOnlineSDDInjectors::FindGoodInjectors(){
 }
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::FindCentroids(){
-  // 
+  // Computes the centroids (weighted mean) of teh injector pads
   for(Int_t jpad=0;jpad<kInjPads;jpad++){
     Int_t ian=GetAnodeNumber(jpad);
     for(Int_t jlin=0;jlin<kInjLines;jlin++){
       if(!fGoodInj[jpad][jlin]) continue;
-      Float_t maxcont=0;
+      Double_t maxcont=0;
       Int_t ilmax=-1;
       for(Int_t jjj=fTbMin[jlin];jjj<fTbMax[jlin];jjj++){
-	Float_t cont=fHisto->GetBinContent(jjj,ian+1);
+	Double_t cont=fHisto->GetBinContent(jjj,ian+1);
 	if(cont>maxcont){
 	  maxcont=cont;
 	  ilmax=jjj;
 	}
       }
-      Float_t intCont=0;
+      Double_t intCont=0;
       Int_t jjj=ilmax;
       while(1){
-	Float_t cont=fHisto->GetBinContent(jjj,ian+1);
-	if(cont<fLowThreshold) break;
+	Double_t cont=fHisto->GetBinContent(jjj,ian+1);
+	if(cont<fLowThreshold[jlin]) break;
 	if(cont<fgkSaturation){
-	  fCentroid[jpad][jlin]+=cont*(Float_t)jjj;
-	  fRMSCentroid[jpad][jlin]+=cont*TMath::Power((Float_t)jjj,2);
+	  fCentroid[jpad][jlin]+=cont*(Double_t)jjj;
+	  fRMSCentroid[jpad][jlin]+=cont*(Double_t)jjj*(Double_t)jjj;
 	  intCont+=cont;
 	}
 	jjj--;
       }
       jjj=ilmax+1;
       while(1){
-	Float_t cont=fHisto->GetBinContent(jjj,ian+1);
-	if(cont<fLowThreshold) break;
+	Double_t cont=fHisto->GetBinContent(jjj,ian+1);
+	if(cont<fLowThreshold[jlin]) break;
 	if(cont<fgkSaturation){
 	  fCentroid[jpad][jlin]+=cont*float(jjj);
-	  fRMSCentroid[jpad][jlin]+=cont*TMath::Power((Float_t)jjj,2);
+	  fRMSCentroid[jpad][jlin]+=cont*(Double_t)jjj*(Double_t)jjj;
 	  intCont+=cont;
 	}
 	jjj++;
       }
       if(intCont>0){ 
 	fCentroid[jpad][jlin]/=intCont;
-	fRMSCentroid[jpad][jlin]=TMath::Sqrt(fRMSCentroid[jpad][jlin]/intCont-fCentroid[jpad][jlin]*fCentroid[jpad][jlin]);
+	fRMSCentroid[jpad][jlin]=TMath::Sqrt(fRMSCentroid[jpad][jlin]/intCont-fCentroid[jpad][jlin]*fCentroid[jpad][jlin])/TMath::Sqrt(intCont);
       }
       else{ 
 	fCentroid[jpad][jlin]=0.;
@@ -429,33 +653,103 @@ void AliITSOnlineSDDInjectors::FindCentroids(){
 }
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::PrintInjectorStatus(){
-  //
+  // Dumps the status bit of injector pads
   for(Int_t jpad=0;jpad<kInjPads;jpad++){
     printf("Line%d-Anode%d: %d %d %d\n",jpad,GetAnodeNumber(jpad),fGoodInj[jpad][0],fGoodInj[jpad][1],fGoodInj[jpad][2]);
   }
 }
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::PrintCentroids(){
-  //
+  // Dumps the drift time centroids of injector pads
   for(Int_t jpad=0;jpad<kInjPads;jpad++){
     printf("Line%d-Anode%d: %f+-%f %f+-%f %f+-%f\n",jpad,GetAnodeNumber(jpad),fCentroid[jpad][0],fRMSCentroid[jpad][0],fCentroid[jpad][1],fRMSCentroid[jpad][1],fCentroid[jpad][2],fRMSCentroid[jpad][2]);
   }
 }
 //______________________________________________________________________
 void AliITSOnlineSDDInjectors::WriteToASCII(Int_t evNumb, UInt_t timeStamp, Int_t optAppend){
-  //
-  Char_t outfilnam[100];
-  sprintf(outfilnam,"SDDinj_ddl%02dc%02d_sid%d.data",fDDL,fCarlos,fSide);  
+  // writes drift speed vs. anode fit parameters into an ASCII file 
+  // to be sent to FXS by the DA and processed by the SHUTTLE
+
+  TString outfilnam;
+  outfilnam.Form("SDDinj_ddl%02dc%02d_sid%d.data",fDDL,fCarlos,fSide);  
   FILE* outf;
   if(optAppend==0){ 
-    outf=fopen(outfilnam,"w");
-    fprintf(outf,"%d\n",fPolOrder);
+    outf=fopen(outfilnam.Data(),"w");
+    fprintf(outf,"%d\n",fActualPolDegree);
   }
-  else outf=fopen(outfilnam,"a");
+  else outf=fopen(outfilnam.Data(),"a");
   fprintf(outf,"%d   %d   ",evNumb,timeStamp);
-  for(Int_t ic=0;ic<fPolOrder+1;ic++){
+  for(Int_t ic=0;ic<fPolDegree+1;ic++){
     fprintf(outf,"%G ",fParam[ic]);
   }
   fprintf(outf,"\n");
   fclose(outf);  
 }
+//______________________________________________________________________
+TH1F* AliITSOnlineSDDInjectors::GetMeanDriftSpeedVsPadHisto() const{
+  // Builds histogram of average drift speed vs. pad number
+  TString hisnam;
+  hisnam.Form("hdrsp%02dc%02ds%d",fDDL,fCarlos,fSide);
+  TH1F* h=new TH1F(hisnam.Data(),"",kInjPads,-0.5,kInjPads-0.5);
+  if(fNEvents>0){
+    for(Int_t i=0;i<kInjPads;i++){ 
+      h->SetBinContent(i+1,GetMeanDriftSpeed(i));    
+      Double_t rms=GetRMSDriftSpeed(i);
+      Double_t err=0.;
+      if(rms>0.) err=rms/TMath::Sqrt(fNEventsInPad[i]);
+      h->SetBinError(i+1,err);
+    }
+  }
+  return h;
+}
+//______________________________________________________________________
+Bool_t AliITSOnlineSDDInjectors::WriteToROOT(TFile *fil) const {
+  // Writes the output histograms into a root file
+  if(fil==0){ 
+    AliWarning("Invalid pointer to ROOT file");
+    return kFALSE;    
+  }  
+  TString hisnam;
+  fil->cd();
+  hisnam.Form("hdrsp%02dc%02ds%d",fDDL,fCarlos,fSide);
+  TH1F hdsp(hisnam.Data(),"",kInjPads,-0.5,kInjPads-0.5);
+  if(fNEvents==0){
+    AliWarning("Zero analyzed events");
+    return kFALSE;    
+  }  
+    
+  for(Int_t i=0;i<kInjPads;i++){ 
+    hdsp.SetBinContent(i+1,GetMeanDriftSpeed(i));    
+    Double_t rms=GetRMSDriftSpeed(i);
+    Double_t err=0.;
+    if(rms>0.) err=rms/TMath::Sqrt(fNEventsInPad[i]);
+    hdsp.SetBinError(i+1,err);
+  }
+  hdsp.Write();
+  return kTRUE;    
+}
+//______________________________________________________________________
+void AliITSOnlineSDDInjectors::WriteInjectorStatusToASCII(){
+  // dump status of injectors encoded into UInt_t
+  // 5 bits (value 0-31) to store number of pads with given status
+  TString outfilnam;
+  outfilnam.Form("SDDinj_ddl%02dc%02d_sid%d.data",fDDL,fCarlos,fSide);  
+  FILE* outf=fopen(outfilnam.Data(),"a");
+  Int_t n[8]={0,0,0,0,0,0,0,0};
+  for(Int_t jpad=fFirstPadForFit; jpad<=fLastPadForFit; jpad++){
+    Int_t statusPad=GetInjPadStatus(jpad);
+    ++n[statusPad];
+  }
+  UInt_t statusInj=0;
+  statusInj+=(n[7]&0x1F)<<25; // bits 25-29: n. of pads with status 7
+  statusInj+=(n[6]&0x1F)<<20; // bits 20-24: n. of pads with status 6
+  statusInj+=(n[5]&0x1F)<<15; // bits 15-19: n. of pads with status 5
+  statusInj+=(n[4]&0x1F)<<10; // bits 10-14: n. of pads with status 4
+  statusInj+=(n[3]&0x1F)<<5;  // bits  5- 9: n. of pads with status 3
+  statusInj+=(n[2]&0x1F);     // bits  0- 4: n. of pads with status 2
+
+  fprintf(outf,"-99 %u\n",statusInj); // -99 used in preprocessor to find line
+                                      // with injector status info
+  fclose(outf);  
+  
+}