]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSsimulationSDD.cxx
Added macro for visualization of the TOF ROOT geometry
[u/mrichter/AliRoot.git] / ITS / AliITSsimulationSDD.cxx
index b83b97be5ef8073067e1d42c94b707dbc8367cda..936c45b48f8bb0d68637687d1fa6818cc17f59bd 100644 (file)
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
+/*
+  $Id$
+  $Log$
+  Revision 1.35  2002/09/09 17:23:28  nilsen
+  Minor changes in support of changes to AliITSdigitS?D class'.
+
+  Revision 1.34  2002/06/07 16:32:28  nilsen
+  Latest SDD changes to speed up the SDD simulation code.
 
+  Revision 1.33  2002/04/24 22:02:31  nilsen
+  New SDigits and Digits routines, and related changes,  (including new
+  noise values).
+
+ */
 
 #include <iostream.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-
+#include <TSystem.h>
+#include <TROOT.h>
+#include <TStopwatch.h>
+#include <TCanvas.h>
+#include <TF1.h>
+#include <TRandom.h>
+#include <TH1.h>
+#include <TFile.h>
+#include <TVector.h>
+#include <TArrayI.h>
+#include <TArrayF.h>
 
 #include "AliRun.h"
+#include "AliITS.h"
+#include "AliITShit.h"
+#include "AliITSdigit.h"
+#include "AliITSmodule.h"
+#include "AliITSpList.h"
+#include "AliITSMapA1.h"
+#include "AliITSMapA2.h"
 #include "AliITSetfSDD.h"
-#include "AliITSsimulationSDD.h"
+#include "AliITSRawData.h"
 #include "AliITSHuffman.h"
-
-const Int_t kMaxNeighbours = 4;
+#include "AliITSgeom.h"
+#include "AliITSsegmentation.h"
+#include "AliITSresponse.h"
+#include "AliITSsegmentationSDD.h"
+#include "AliITSresponseSDD.h"
+#include "AliITSsimulationSDD.h"
 
 ClassImp(AliITSsimulationSDD)
 ////////////////////////////////////////////////////////////////////////
@@ -47,956 +81,1285 @@ ClassImp(AliITSsimulationSDD)
 <pre>
 */
 //End_Html
-//_____________________________________________________________________________
-
+//______________________________________________________________________
 Int_t power(Int_t b, Int_t e) {
-  // copute b to the e power, where bothe b and e are Int_ts.
-  Int_t power = 1,i;
-  for(i=0; i<e; i++) power *= b;
-  return power;
-}
-
-//_____________________________________________
+    // compute b to the e power, where both b and e are Int_ts.
+    Int_t power = 1,i;
 
+    for(i=0; i<e; i++) power *= b;
+    return power;
+}
+//______________________________________________________________________
 void FastFourierTransform(AliITSetfSDD *alisddetf,Double_t *real,
                           Double_t *imag,Int_t direction) {
-  // Do a Fast Fourier Transform
-
-  Int_t samples = alisddetf->GetSamples();
-  Int_t l = (Int_t) ((log((Float_t) samples)/log(2.))+0.5);
-  Int_t m1 = samples;
-  Int_t m  = samples/2;
-  Int_t m2 = samples/m1;
-  Int_t i,j,k;
-  for(i=1; i<=l; i++) {
-    for(j=0; j<samples; j += m1) {
-      Int_t p = 0;
-      for(k=j; k<= j+m-1; k++) {
-       Double_t wsr = alisddetf->GetWeightReal(p);
-        Double_t wsi = alisddetf->GetWeightImag(p);
-       if(direction == -1) wsi = -wsi;
-       Double_t xr = *(real+k+m);
-       Double_t xi = *(imag+k+m);
-       *(real+k+m) = wsr*(*(real+k)-xr) - wsi*(*(imag+k)-xi);
-       *(imag+k+m) = wsr*(*(imag+k)-xi) + wsi*(*(real+k)-xr);
-       *(real+k) += xr;
-       *(imag+k) += xi;
-       p += m2;
-      }
-    }
-    m1 = m;
-    m /= 2;
-    m2 += m2;
-  } 
+    // Do a Fast Fourier Transform
+
+    Int_t samples = alisddetf->GetSamples();
+    Int_t l = (Int_t) ((log((Float_t) samples)/log(2.))+0.5);
+    Int_t m1 = samples;
+    Int_t m  = samples/2;
+    Int_t m2 = samples/m1;
+    Int_t i,j,k;
+    for(i=1; i<=l; i++) {
+        for(j=0; j<samples; j += m1) {
+            Int_t p = 0;
+            for(k=j; k<= j+m-1; k++) {
+                Double_t wsr = alisddetf->GetWeightReal(p);
+                Double_t wsi = alisddetf->GetWeightImag(p);
+                if(direction == -1) wsi = -wsi;
+                Double_t xr = *(real+k+m);
+                Double_t xi = *(imag+k+m);
+                *(real+k+m) = wsr*(*(real+k)-xr) - wsi*(*(imag+k)-xi);
+                *(imag+k+m) = wsr*(*(imag+k)-xi) + wsi*(*(real+k)-xr);
+                *(real+k) += xr;
+                *(imag+k) += xi;
+                p += m2;
+            } // end for k
+        } // end for j
+        m1 = m;
+        m /= 2;
+        m2 += m2;
+    } // end for i
   
-  for(j=0; j<samples; j++) {
-    Int_t j1 = j;
-    Int_t p = 0;
-    Int_t i1;
-    for(i1=1; i1<=l; i1++) {
-      Int_t j2 = j1;
-      j1 /= 2;
-      p = p + p + j2 - j1 - j1;
-    }
-    if(p >= j) {
-      Double_t xr = *(real+j);
-      Double_t xi = *(imag+j);
-      *(real+j) = *(real+p);
-      *(imag+j) = *(imag+p);
-      *(real+p) = xr;
-      *(imag+p) = xi;
-    }
-  }
-  if(direction == -1) {
-    for(i=0; i<samples; i++) {
-      *(real+i) /= samples;
-      *(imag+i) /= samples;
-    }
-  }
-  return;
+    for(j=0; j<samples; j++) {
+        Int_t j1 = j;
+        Int_t p = 0;
+        Int_t i1;
+        for(i1=1; i1<=l; i1++) {
+            Int_t j2 = j1;
+            j1 /= 2;
+            p = p + p + j2 - j1 - j1;
+        } // end for i1
+        if(p >= j) {
+            Double_t xr = *(real+j);
+            Double_t xi = *(imag+j);
+            *(real+j) = *(real+p);
+            *(imag+j) = *(imag+p);
+            *(real+p) = xr;
+            *(imag+p) = xi;
+        } // end if p>=j
+    } // end for j
+    if(direction == -1) {
+        for(i=0; i<samples; i++) {
+            *(real+i) /= samples;
+            *(imag+i) /= samples;
+        } // end for i
+    } // end if direction == -1
+    return;
 }
-//_____________________________________________________________________________
-
+//______________________________________________________________________
 AliITSsimulationSDD::AliITSsimulationSDD(){
-  // Default constructor
-
-  fResponse = 0;
-  fSegmentation = 0;
-  fHis = 0;
-  fD.Set(0);
-  fT1.Set(0);
-  fT2.Set(0);
-  fTol.Set(0);
-  fInZR = 0;
-  fInZI = 0;
-  fOutZR = 0;
-  fOutZI = 0;
-
+    // Default constructor
+
+    fResponse      = 0;
+    fSegmentation  = 0;
+    fHis           = 0;
+//    fpList         = 0;
+    fHitMap2       = 0;
+    fHitSigMap2    = 0;
+    fHitNoiMap2    = 0;
+    fElectronics   = 0;
+    fStream        = 0;
+    fInZR          = 0;
+    fInZI          = 0;
+    fOutZR         = 0;
+    fOutZI         = 0;
+    fNofMaps       = 0;
+    fMaxNofSamples = 0;
+    fITS           = 0;
+    fTreeB         = 0;
+    fAnodeFire     = 0;
+    SetScaleFourier();
+    SetPerpendTracksFlag();
+    SetCrosstalkFlag();
+    SetDoFFT();
+    SetCheckNoise();
 }
-//_____________________________________________________________________________
+//______________________________________________________________________
 AliITSsimulationSDD::AliITSsimulationSDD(AliITSsimulationSDD &source){
-  // Copy constructor to satify Coding roules only.
-  if(this==&source) return;
-  printf("Not allowed to make a copy of AliITSsimulationSDD "
-         "Using default creater instead\n");
-  AliITSsimulationSDD();
+    // Copy constructor to satify Coding roules only.
+
+    if(this==&source) return;
+    Error("AliITSsimulationSSD","Not allowed to make a copy of "
+          "AliITSsimulationSDD Using default creater instead");
+    AliITSsimulationSDD();
 }
-//_____________________________________________________________________________
-AliITSsimulationSDD& AliITSsimulationSDD::operator=(AliITSsimulationSDD 
-                                                     &source){
-  // Copy constructor to satify Coding roules only.
-  if(this==&source) return *this;
-  printf("Not allowed to make a = with AliITSsimulationSDD "
-         "Using default creater instead\n");
-  return *this ;
+//______________________________________________________________________
+AliITSsimulationSDD& AliITSsimulationSDD::operator=(AliITSsimulationSDD &src){
+    // Assignment operator to satify Coding roules only.
+
+    if(this==&src) return *this;
+    Error("AliITSsimulationSSD","Not allowed to make a = with "
+          "AliITSsimulationSDD Using default creater instead");
+    return *this ;
 }
-//_____________________________________________________________________________
-
+//______________________________________________________________________
 AliITSsimulationSDD::AliITSsimulationSDD(AliITSsegmentation *seg,
-                                         AliITSresponse *resp) {
-  // Constructor
-      fResponse = resp;
-      fSegmentation = seg;
-
-      fHitMap2 = new AliITSMapA2(fSegmentation);
-      fHitMap1 = new AliITSMapA1(fSegmentation);
-
-      //
-      fNofMaps=fSegmentation->Npz();
-      fMaxNofSamples=fSegmentation->Npx();
-
-      Float_t sddLength = fSegmentation->Dx();
-      Float_t sddWidth = fSegmentation->Dz();
-
-      Int_t dummy=0;
-      Float_t anodePitch = fSegmentation->Dpz(dummy);
-      Double_t timeStep = (Double_t)fSegmentation->Dpx(dummy);
-      Float_t driftSpeed=fResponse->DriftSpeed();    
-
-      if(anodePitch*(fNofMaps/2) > sddWidth) {
-         Warning("AliITSsimulationSDD",
-            "Too many anodes %d or too big pitch %f \n",fNofMaps/2,anodePitch);
-      }
-
-      if(timeStep*fMaxNofSamples < sddLength/driftSpeed) {
-         Error("AliITSsimulationSDD",
-                              "Time Interval > Allowed Time Interval: exit\n");
-         return;
-      }
-
-      fElectronics = new AliITSetfSDD(timeStep);
-
-      Option_t *opt1, *opt2;
-      fResponse->ParamOptions(opt1,opt2);
-      fParam=opt2;
-      char *same = strstr(opt1,"same");
-      if (same) {
-         fNoise.Set(0);
-         fBaseline.Set(0);
-      } else {
-         fNoise.Set(fNofMaps);
-         fBaseline.Set(fNofMaps);
-      }
-      
-      //
-      Option_t *opt=fResponse->ZeroSuppOption();
-        if (strstr(fParam,"file") ) {
-         fD.Set(fNofMaps);
-         fT1.Set(fNofMaps);
-          if (strstr(opt,"2D")) {
-           fT2.Set(fNofMaps);
+                                         AliITSresponse *resp){
+    // Standard Constructor
+
+    fResponse      = 0;
+    fSegmentation  = 0;
+    fHis           = 0;
+//    fpList         = 0;
+    fHitMap2       = 0;
+    fHitSigMap2    = 0;
+    fHitNoiMap2    = 0;
+    fElectronics   = 0;
+    fStream        = 0;
+    fInZR          = 0;
+    fInZI          = 0;
+    fOutZR         = 0;
+    fOutZI         = 0;
+    fNofMaps       = 0;
+    fMaxNofSamples = 0;
+    fITS           = 0;
+    fTreeB         = 0;
+
+    Init((AliITSsegmentationSDD*)seg,(AliITSresponseSDD*)resp);
+}
+//______________________________________________________________________
+void AliITSsimulationSDD::Init(AliITSsegmentationSDD *seg,
+                               AliITSresponseSDD *resp){
+    // Standard Constructor
+
+    fResponse     = resp;
+    fSegmentation = seg;
+    SetScaleFourier();
+    SetPerpendTracksFlag();
+    SetCrosstalkFlag();
+    SetDoFFT();
+    SetCheckNoise();
+
+    fpList = new AliITSpList( fSegmentation->Npz(),
+                              fScaleSize*fSegmentation->Npx() );
+    fHitSigMap2 = new AliITSMapA2(fSegmentation,fScaleSize,1);
+    fHitNoiMap2 = new AliITSMapA2(fSegmentation,fScaleSize,1);
+    fHitMap2 = fHitSigMap2;
+
+    fNofMaps = fSegmentation->Npz();
+    fMaxNofSamples = fSegmentation->Npx();
+    fAnodeFire = new Bool_t [fNofMaps];
+    
+    Float_t sddLength = fSegmentation->Dx();
+    Float_t sddWidth  = fSegmentation->Dz();
+
+    Int_t dummy        = 0;
+    Float_t anodePitch = fSegmentation->Dpz(dummy);
+    Double_t timeStep  = (Double_t)fSegmentation->Dpx(dummy);
+    Float_t driftSpeed = fResponse->DriftSpeed();
+
+    if(anodePitch*(fNofMaps/2) > sddWidth) {
+        Warning("AliITSsimulationSDD",
+                "Too many anodes %d or too big pitch %f \n",
+                fNofMaps/2,anodePitch);
+    } // end if
+
+    if(timeStep*fMaxNofSamples < sddLength/driftSpeed) {
+        Error("AliITSsimulationSDD",
+              "Time Interval > Allowed Time Interval: exit\n");
+        return;
+    } // end if
+
+    fElectronics = new AliITSetfSDD(timeStep/fScaleSize,
+                                    fResponse->Electronics());
+
+    char opt1[20], opt2[20];
+    fResponse->ParamOptions(opt1,opt2);
+    fParam = opt2;
+    char *same = strstr(opt1,"same");
+    if (same) {
+        fNoise.Set(0);
+        fBaseline.Set(0);
+    } else {
+        fNoise.Set(fNofMaps);
+        fBaseline.Set(fNofMaps);
+    } // end if
+
+    const char *kopt=fResponse->ZeroSuppOption();
+    if (strstr(fParam,"file") ) {
+        fD.Set(fNofMaps);
+        fT1.Set(fNofMaps);
+        if (strstr(kopt,"2D")) {
+            fT2.Set(fNofMaps);
             fTol.Set(0);
             Init2D();       // desactivate if param change module by module
-          } else if(strstr(opt,"1D"))  {
+        } else if(strstr(kopt,"1D"))  {
             fT2.Set(2);
             fTol.Set(2);
             Init1D();      // desactivate if param change module by module
-         }
-       } else {
-          fD.Set(2);
-         fTol.Set(2);
-         fT1.Set(2);
-         fT2.Set(2);
-         SetCompressParam();
-       }
-
-
-       Bool_t write=fResponse->OutputOption();
-       if(write && strstr(opt,"2D")) MakeTreeB();
-
-        // call here if baseline does not change by module
-        // ReadBaseline();
-
-        fITS = (AliITS*)gAlice->GetModule("ITS");
-        Int_t size=fNofMaps*fMaxNofSamples;
-       fStream = new AliITSInStream(size); 
-       
-   fInZR = new Double_t [fMaxNofSamples];
-   fInZI = new Double_t [fMaxNofSamples];
-   fOutZR = new Double_t [fMaxNofSamples];
-   fOutZI = new Double_t [fMaxNofSamples];  
+        } // end if strstr
+    } else {
+        fD.Set(2);
+        fTol.Set(2);
+        fT1.Set(2);
+        fT2.Set(2);
+        SetCompressParam();
+    } // end if else strstr
 
-}
+    Bool_t write = fResponse->OutputOption();
+    if(write && strstr(kopt,"2D")) MakeTreeB();
+
+    // call here if baseline does not change by module
+    // ReadBaseline();
 
+    fITS       = (AliITS*)gAlice->GetModule("ITS");
+    Int_t size = fNofMaps*fMaxNofSamples;
+    fStream    = new AliITSInStream(size);
 
-//_____________________________________________________________________________
+    fInZR  = new Double_t [fScaleSize*fMaxNofSamples];
+    fInZI  = new Double_t [fScaleSize*fMaxNofSamples];
+    fOutZR = new Double_t [fScaleSize*fMaxNofSamples];
+    fOutZI = new Double_t [fScaleSize*fMaxNofSamples];  
 
+}
+//______________________________________________________________________
 AliITSsimulationSDD::~AliITSsimulationSDD() { 
-  // destructor
-
-  delete fHitMap1;
-  delete fHitMap2;
-  delete fStream;
-
-  fD.Set(0);
-  fT1.Set(0);
-  fT2.Set(0);
-  fTol.Set(0);
-  fNoise.Set(0);
-  fBaseline.Set(0);
-
-  if (fHis) {
-     fHis->Delete(); 
-     delete fHis;     
-  }  
-  
-   delete [] fInZR;
-   delete [] fInZI;    
-       delete [] fOutZR;
-       delete [] fOutZI;
-       
-       delete  fInZR;
-   delete  fInZI;  
-       delete  fOutZR;
-       delete  fOutZI;                          
+    // destructor
+
+//    delete fpList;
+    delete fHitSigMap2;
+    delete fHitNoiMap2;
+    delete fStream;
+    delete fElectronics;
+
+    fITS = 0;
+
+    if (fHis) {
+        fHis->Delete(); 
+        delete fHis;     
+    } // end if fHis
+    if(fTreeB) delete fTreeB;           
+    if(fInZR)  delete [] fInZR;
+    if(fInZI)  delete [] fInZI;        
+    if(fOutZR) delete [] fOutZR;
+    if(fOutZI) delete [] fOutZI;
+    if(fAnodeFire) delete [] fAnodeFire;
+}
+//______________________________________________________________________
+void AliITSsimulationSDD::InitSimulationModule( Int_t module, Int_t event ) {
+    // create maps to build the lists of tracks for each summable digit
+    fModule = module;
+    fEvent  = event;
+    ClearMaps();
+    memset(fAnodeFire,0,sizeof(Bool_t)*fNofMaps);    
 }
-//_____________________________________________________________________________
+//______________________________________________________________________
+void AliITSsimulationSDD::ClearMaps() {
+    // clear maps
+    fpList->ClearMap();
+    fHitSigMap2->ClearMap();
+    fHitNoiMap2->ClearMap();
+}
+//______________________________________________________________________
+void AliITSsimulationSDD::SDigitiseModule( AliITSmodule *mod, Int_t md, Int_t ev){
+    // digitize module using the "slow" detector simulator creating
+    // summable digits.
 
+    TObjArray *fHits = mod->GetHits();
+    Int_t nhits      = fHits->GetEntriesFast();
+    if( !nhits ) return;
+
+    InitSimulationModule( md, ev );
+    HitsToAnalogDigits( mod );
+    ChargeToSignal( kFALSE ); // - Process signal without add noise
+    fHitMap2 = fHitNoiMap2;   // - Swap to noise map
+    ChargeToSignal( kTRUE );  // - Process only noise
+    fHitMap2 = fHitSigMap2;   // - Return to signal map
+    WriteSDigits();
+    ClearMaps();
+}
+//______________________________________________________________________
+Bool_t AliITSsimulationSDD::AddSDigitsToModule( TClonesArray *pItemArray, Int_t mask ) {
+    // Add Summable digits to module maps.
+    Int_t    nItems = pItemArray->GetEntries();
+    Double_t maxadc = fResponse->MaxAdc();
+    //Bool_t sig = kFALSE;
+    
+    // cout << "Adding "<< nItems <<" SDigits to module " << fModule << endl;
+    for( Int_t i=0; i<nItems; i++ ) {
+        AliITSpListItem * pItem = (AliITSpListItem *)(pItemArray->At( i ));
+        if( pItem->GetModule() != fModule ) {
+            Error( "AliITSsimulationSDD",
+                   "Error reading, SDigits module %d != current module %d: exit\n",
+                    pItem->GetModule(), fModule );
+            return kFALSE;
+        } // end if
+
+      //  if(pItem->GetSignal()>0.0 ) sig = kTRUE;
+        
+        fpList->AddItemTo( mask, pItem ); // Add SignalAfterElect + noise
+        AliITSpListItem * pItem2 = fpList->GetpListItem( pItem->GetIndex() );
+        Double_t sigAE = pItem2->GetSignalAfterElect();
+        if( sigAE >= maxadc ) sigAE = maxadc-1; // avoid overflow signal
+        Int_t ia;
+        Int_t it;
+        fpList->GetMapIndex( pItem->GetIndex(), ia, it );
+        fHitMap2->SetHit( ia, it, sigAE );
+        fAnodeFire[ia] = kTRUE;
+    }
+    return kTRUE;
+}
+//______________________________________________________________________
+void AliITSsimulationSDD::FinishSDigitiseModule() {
+    // digitize module using the "slow" detector simulator from
+    // the sum of summable digits.
+    FinishDigits() ;
+    ClearMaps();
+}
+//______________________________________________________________________
 void AliITSsimulationSDD::DigitiseModule(AliITSmodule *mod,Int_t md,Int_t ev){
-  // create maps to build the lists of tracks
-  // for each digit
-
-    fModule=md;
-    fEvent=ev;
+    // create maps to build the lists of tracks for each digit
 
     TObjArray *fHits = mod->GetHits();
-    Int_t nhits = fHits->GetEntriesFast();
-    if (!nhits) return;
-
-
-    TObjArray *list=new TObjArray;
-    static TClonesArray *padr=0;
-    if(!padr) padr=new TClonesArray("TVector",1000);
-    Int_t arg[5] = {0,0,0,0,0}; 
-    fHitMap1->SetArray(list);
-
-
-    Int_t NofAnodes=fNofMaps/2;
+    Int_t nhits      = fHits->GetEntriesFast();
+
+    InitSimulationModule( md, ev );
+
+    if( !nhits && fCheckNoise ) {
+        ChargeToSignal( kTRUE );  // process noise
+        GetNoise();
+        ClearMaps();
+        return;
+    } else 
+        if( !nhits ) return;
+        
+    HitsToAnalogDigits( mod );
+    ChargeToSignal( kTRUE );  // process signal + noise
+
+    for( Int_t i=0; i<fNofMaps; i++ ) {
+        for( Int_t j=0; j<fMaxNofSamples; j++ ) {
+            Int_t jdx = j*fScaleSize;
+            Int_t index = fpList->GetHitIndex( i, j );
+            AliITSpListItem pItemTmp2( fModule, index, 0. );
+            // put the fScaleSize analog digits in only one
+            for( Int_t ik=0; ik<fScaleSize; ik++ ) {
+                AliITSpListItem *pItemTmp = fpList->GetpListItem( i, jdx+ik );
+                if( pItemTmp == 0 ) continue;
+                pItemTmp2.Add( pItemTmp );
+            }
+            fpList->DeleteHit( i, j );
+            fpList->AddItemTo( 0, &pItemTmp2 );
+        }
+    }
 
-    Float_t sddLength = fSegmentation->Dx();
-    Float_t sddWidth = fSegmentation->Dz();
+    FinishDigits();
+    ClearMaps();
+}
+//______________________________________________________________________
+void AliITSsimulationSDD::FinishDigits() {
+    // introduce the electronics effects and do zero-suppression if required
 
-    Int_t dummy=0;
-    Float_t anodePitch = fSegmentation->Dpz(dummy);
-    Float_t timeStep = fSegmentation->Dpx(dummy);
+    ApplyDeadChannels();
+    if( fCrosstalkFlag ) ApplyCrosstalk();
 
-    Float_t driftSpeed=fResponse->DriftSpeed();    
+    const char *kopt = fResponse->ZeroSuppOption();
+    ZeroSuppression( kopt );
+}
+//______________________________________________________________________
+void AliITSsimulationSDD::HitsToAnalogDigits( AliITSmodule *mod ) {
+    // create maps to build the lists of tracks for each digit
+
+    TObjArray *fHits    = mod->GetHits();
+    Int_t      nhits    = fHits->GetEntriesFast();
+//    Int_t      arg[6]   = {0,0,0,0,0,0};
+    Int_t    dummy      = 0;
+    Int_t    nofAnodes  = fNofMaps/2;
+    Float_t  sddLength  = fSegmentation->Dx();
+    Float_t  sddWidth   = fSegmentation->Dz();
+    Float_t  anodePitch = fSegmentation->Dpz(dummy);
+    Float_t  timeStep   = fSegmentation->Dpx(dummy);
+    Float_t  driftSpeed = fResponse->DriftSpeed();
+    Float_t  maxadc     = fResponse->MaxAdc();    
+    Float_t  topValue   = fResponse->DynamicRange();
+    Float_t  cHloss     = fResponse->ChargeLoss();
+    Float_t  norm       = maxadc/topValue;
+    Float_t  dfCoeff, s1; fResponse->DiffCoeff(dfCoeff,s1); // Signal 2d Shape
+    Double_t eVpairs    = 3.6;  // electron pair energy eV.
+    Float_t  nsigma     = fResponse->NSigmaIntegration(); //
+    Int_t    nlookups   = fResponse->GausNLookUp();       //
+    Float_t  jitter     = ((AliITSresponseSDD*)fResponse)->JitterError(); // 
 
     // Piergiorgio's part (apart for few variables which I made float
     // when i thought that can be done
-
     // Fill detector maps with GEANT hits
     // loop over hits in the module
 
-    const Float_t kconv=1000000.;  // GeV->KeV
-    Int_t ii;
+    const Float_t kconv = 1.0e+6;  // GeV->KeV
+    Int_t    itrack      = 0;
+    Int_t    hitDetector; // detector number (lay,lad,hitDetector)
+    Int_t    iWing;       // which detector wing/side.
+    Int_t    detector;    // 2*(detector-1)+iWing
+    Int_t    ii,kk,ka,kt; // loop indexs
+    Int_t    ia,it,index; // sub-pixel integration indexies
+    Int_t    iAnode;      // anode number.
+    Int_t    timeSample;  // time buckett.
+    Int_t    anodeWindow; // anode direction charge integration width
+    Int_t    timeWindow;  // time direction charge integration width
+    Int_t    jamin,jamax; // anode charge integration window
+    Int_t    jtmin,jtmax; // time charge integration window
+    Int_t    ndiv;        // Anode window division factor.
+    Int_t    nsplit;      // the number of splits in anode and time windows==1.
+    Int_t    nOfSplits;   // number of times track length is split into
+    Float_t  nOfSplitsF;  // Floating point version of nOfSplits.
+    Float_t  kkF;         // Floating point version of loop index kk.
+    Float_t  pathInSDD; // Track length in SDD.
+    Float_t  drPath; // average position of track in detector. in microns
+    Float_t  drTime; // Drift time
+    Float_t  nmul;   // drift time window multiplication factor.
+    Float_t  avDrft;  // x position of path length segment in cm.
+    Float_t  avAnode; // Anode for path length segment in Anode number (float)
+    Float_t  xAnode;  // Floating point anode number.
+    Float_t  driftPath; // avDrft in microns.
+    Float_t  width;     // width of signal at anodes.
+    Double_t  depEnergy; // Energy deposited in this GEANT step.
+    Double_t  xL[3],dxL[3]; // local hit coordinates and diff.
+    Double_t sigA; // sigma of signal at anode.
+    Double_t sigT; // sigma in time/drift direction for track segment
+    Double_t aStep,aConst; // sub-pixel size and offset anode
+    Double_t tStep,tConst; // sub-pixel size and offset time
+    Double_t amplitude; // signal amplitude for track segment in nanoAmpere
+    Double_t chargeloss; // charge loss for track segment.
+    Double_t anodeAmplitude; // signal amplitude in anode direction
+    Double_t aExpo;          // exponent of Gaussian anode direction
+    Double_t timeAmplitude;  // signal amplitude in time direction
+    Double_t tExpo;          // exponent of Gaussian time direction
+//  Double_t tof;            // Time of flight in ns of this step.    
+
     for(ii=0; ii<nhits; ii++) {
-       AliITShit *hit = (AliITShit*) fHits->At(ii);
-       Int_t hitDetector = hit->GetDetector();
-       Float_t xL[3];
-       hit->GetPositionL(xL[0],xL[1],xL[2]);
-       //  cout << "hit local coordinates: " << xL[0] << "," << xL[1] << "," << xL[2] << endl;
-       // Deposited energy in keV
-       Float_t avpath = 0.;
-       Float_t avanod = 0.;
-       Float_t depEnergy = kconv*hit->GetIonization();
-       AliITShit *hit1 = 0;
-       if(depEnergy == 0.) { 
-         ii++;
-         Float_t xL1[3];
-         hit1 = (AliITShit*) fHits->At(ii);
-         hit1->GetPositionL(xL1[0],xL1[1],xL1[2]);
-         //cout << "hit1 local coordinates: " << xL1[0] << "," << xL1[1] << "," << xL1[2] << endl;
-         //cout << "radius1: " << TMath::Sqrt(xL1[0]*xL1[0]+xL1[1]*xL1[1]) << ", azimuth: " << TMath::ATan2(xL1[0],xL1[1]) << endl;
-         avpath = xL1[0];
-         avanod = xL1[2];
-         depEnergy = kconv*hit1->GetIonization();
-       }
-       Float_t avDrft = xL[0]+avpath;
-       Float_t avAnode = xL[2]+avanod;
-
-       if(avpath != 0.) avDrft /= 2.;
-       if(avanod != 0.) avAnode /= 2.;
-
-       Float_t driftPath = 10000.*avDrft;
-       //printf("sddLength %f avDrft driftPath %f %f\n",sddLength,avDrft, driftPath);
-       Int_t iWing = 2;
-       if(driftPath < 0) {
-         iWing = 1;
-         driftPath = -driftPath;
-       }
-       driftPath = sddLength-driftPath;
-       Int_t detector = 2*(hitDetector-1) + iWing;
-       if(driftPath < 0) {
-         cout << "Warning: negative drift path " << driftPath << endl;
-         continue;
-       }
-        
-       //   Drift Time
-       Float_t driftTime = driftPath/driftSpeed;
-       Int_t timeSample = (Int_t) (driftTime/timeStep + 1);
-       if(timeSample > fMaxNofSamples) {
-         cout << "Warning: Wrong Time Sample: " << timeSample << endl;
-         continue;
-       }
-
-       //   Anode
-       Float_t xAnode = 10000.*(avAnode)/anodePitch + NofAnodes/2;  // +1?
-       //    Int_t iAnode = 0.5+xAnode; // xAnode?
-       if(xAnode*anodePitch > sddWidth || xAnode*anodePitch < 0.) 
-             { cout << "Warning: Z = " << xAnode*anodePitch << endl; }
-       Int_t iAnode = (Int_t) (1.+xAnode); // xAnode?
-       //    cout << "iAnode " << iAnode << endl;
-       if(iAnode < 0 || iAnode > NofAnodes) {
-         cout << "Warning: Wrong iAnode: " << iAnode << endl;
-         continue;
-       } 
-
-
-       // work with the idtrack=entry number in the TreeH
-       // Int_t idtrack=mod->GetHitTrackIndex(ii);  
-        // or store straight away the particle position in the array
-       // of particles : 
-        Int_t idtrack = hit->GetTrack();
-
-       //  Signal 2d Shape
-       Double_t qRef = (Double_t)fResponse->Qref();
-       Double_t diffCoeff = (Double_t)fResponse->DiffCoeff();
+        if(!mod->LineSegmentL(ii,xL[0],dxL[0],xL[1],dxL[1],xL[2],dxL[2],
+                              depEnergy,itrack)) continue;
+        xL[0] += 0.0001*gRandom->Gaus( 0, jitter ); //
+        depEnergy  *= kconv;
+        hitDetector = mod->GetDet();
+        //tof         = 1.E+09*(mod->GetHit(ii)->GetTOF()); // tof in ns.
+        //if(tof>sddLength/driftSpeed) continue; // hit happed too late.
+
+        // scale path to simulate a perpendicular track
+        // continue if the particle did not lose energy
+        // passing through detector
+        if (!depEnergy) {
+            Warning("HitsToAnalogDigits", 
+                    "fTrack = %d hit=%d module=%d This particle has"
+                    " passed without losing energy!",
+                    itrack,ii,mod->GetIndex());
+            continue;
+        } // end if !depEnergy
+
+        pathInSDD = TMath::Sqrt(dxL[0]*dxL[0]+dxL[1]*dxL[1]+dxL[2]*dxL[2]);
+
+        if (fFlag && pathInSDD) { depEnergy *= (0.03/pathInSDD); }
+        drPath = 10000.*(dxL[0]+2.*xL[0])*0.5;
+        if(drPath < 0) drPath = -drPath;
+        drPath = sddLength-drPath;
+        if(drPath < 0) {
+            Warning("HitsToAnalogDigits",
+                    "negative drift path drPath=%e sddLength=%e dxL[0]=%e "
+                    "xL[0]=%e",
+                    drPath,sddLength,dxL[0],xL[0]);
+            continue;
+        } // end if drPath < 0
+
+        // Compute number of segments to brake step path into
+        drTime = drPath/driftSpeed;  //   Drift Time
+        sigA   = TMath::Sqrt(2.*dfCoeff*drTime+s1*s1);// Sigma along the anodes
+        // calcuate the number of time the path length should be split into.
+        nOfSplits = (Int_t) (1. + 10000.*pathInSDD/sigA);
+        if(fFlag) nOfSplits = 1;
+
+        // loop over path segments, init. some variables.
+        depEnergy /= nOfSplits;
+        nOfSplitsF = (Float_t) nOfSplits;
+        for(kk=0;kk<nOfSplits;kk++) { // loop over path segments
+            kkF       = (Float_t) kk + 0.5;
+            avDrft    = xL[0]+dxL[0]*kkF/nOfSplitsF;
+            avAnode   = xL[2]+dxL[2]*kkF/nOfSplitsF;
+            driftPath = 10000.*avDrft;
+
+            iWing = 2;  // Assume wing is 2
+            if(driftPath < 0) { // if wing is not 2 it is 1.
+                iWing     = 1;
+                driftPath = -driftPath;
+            } // end if driftPath < 0
+            driftPath = sddLength-driftPath;
+            detector  = 2*(hitDetector-1) + iWing;
+            if(driftPath < 0) {
+                Warning("HitsToAnalogDigits","negative drift path "
+                        "driftPath=%e sddLength=%e avDrft=%e dxL[0]=%e "
+                        "xL[0]=%e",driftPath,sddLength,avDrft,dxL[0],xL[0]);
+                continue;
+            } // end if driftPath < 0
+
+            //   Drift Time
+            drTime     = driftPath/driftSpeed; // drift time for segment.
+            timeSample = (Int_t) (fScaleSize*drTime/timeStep + 1);
+            // compute time Sample including tof information. The tof only 
+            // effects the time of the signal is recoreded and not the
+            // the defusion.
+            // timeSample = (Int_t) (fScaleSize*(drTime+tof)/timeStep + 1);
+            if(timeSample > fScaleSize*fMaxNofSamples) {
+                Warning("HitsToAnalogDigits","Wrong Time Sample: %e",
+                        timeSample);
+                continue;
+            } // end if timeSample > fScaleSize*fMaxNoofSamples
+
+            //   Anode
+            xAnode = 10000.*(avAnode)/anodePitch + nofAnodes/2;  // +1?
+            if(xAnode*anodePitch > sddWidth || xAnode*anodePitch < 0.) 
+                          Warning("HitsToAnalogDigits",
+                                  "Exceedubg sddWidth=%e Z = %e",
+                                  sddWidth,xAnode*anodePitch);
+            iAnode = (Int_t) (1.+xAnode); // xAnode?
+            if(iAnode < 1 || iAnode > nofAnodes) {
+                Warning("HitToAnalogDigits","Wrong iAnode: 1<%d>%d",
+                        iAnode,nofAnodes);
+                continue;
+            } // end if iAnode < 1 || iAnode > nofAnodes
+
+            // store straight away the particle position in the array
+            // of particles and take idhit=ii only when part is entering (this
+            // requires FillModules() in the macro for analysis) :
     
-       Double_t gamma = 1. + 0.155*depEnergy/qRef;
-       // Squared Sigma along the anodes
-       Double_t sigma2A = 2.*diffCoeff*driftTime*gamma;
-       Double_t sigmaT  = TMath::Sqrt(sigma2A)/driftSpeed;
-    
-       // Peak amplitude in nanoAmpere
-       Double_t eVpairs = 3.6;
-       Double_t amplitude = 160.*depEnergy/(timeStep*eVpairs*2.*acos(-1.)*sigmaT*TMath::Sqrt(sigma2A));
-    
-       // Spread the charge 
-       // Pixel index
-       Int_t ja = iAnode;
-       Int_t jt = timeSample;
-       // Sub-pixel index
-       Int_t nsplit = 8;
-       nsplit = (nsplit+1)/2*2;
-       // Sub-pixel size
-       Double_t aStep = anodePitch/nsplit;
-       Double_t tStep = timeStep/nsplit;
-       // Define SDD window corresponding to the hit
-       Int_t anodeWindow = (Int_t) (4.*TMath::Sqrt(sigma2A)/anodePitch + 1);
-       Int_t timeWindow = (Int_t) (4.*sigmaT/timeStep + 1);
-       Int_t jamin = (ja - anodeWindow/2 - 1)*nsplit + 1;
-       Int_t jamax = (ja + anodeWindow/2)*nsplit;
-       if(jamin <= 0) jamin = 1;
-       if(jamax > NofAnodes*nsplit) jamax = NofAnodes*nsplit;
-       Int_t jtmin = (jt - timeWindow/2 - 1)*nsplit + 1;
-       Int_t jtmax = (jt + timeWindow/2)*nsplit;
-       if(jtmin <= 0) jtmin = 1;
-       if(jtmax > fMaxNofSamples*nsplit) jtmax = fMaxNofSamples*nsplit;
-       Double_t rlAnode = log(aStep*amplitude);
-       // Spread the charge in the anode-time window
-        Int_t ka;
-       for(ka=jamin; ka <=jamax; ka++) {
-         Int_t ia = (ka-1)/nsplit + 1;
-         if(ia <= 0) { cout << "Warning: ia < 1: " << endl; continue; }
-         if(ia > NofAnodes) ia = NofAnodes;
-         Double_t aExpo = aStep*(ka)-xAnode*anodePitch;
-         Double_t anodeAmplitude = rlAnode - 0.5*aExpo*aExpo/sigma2A;
-         // Protect against overflows
-         if(anodeAmplitude > -87.3)
-           anodeAmplitude = exp(anodeAmplitude);
-         else
-           anodeAmplitude = 0;
-         if(anodeAmplitude) {
-           Double_t rlTime = log(tStep*anodeAmplitude);
-            Int_t kt;
-           for(kt=jtmin; kt<=jtmax; kt++) {
-             Int_t it = (kt-1)/nsplit+1;
-             if(it<=0) { cout << "Warning: it < 1: " << endl; continue; } 
-             if(it>fMaxNofSamples) it = fMaxNofSamples;
-             Double_t tExpo = (tStep*(kt)-driftTime)/sigmaT;
-             Double_t timeAmplitude = rlTime - 0.5*tExpo*tExpo;
-             // Protect against overflows
-             if(timeAmplitude > -87.3)
-               timeAmplitude = exp(timeAmplitude);
-             else
-               timeAmplitude = 0;
-
-             Int_t index = ((detector+1)%2)*NofAnodes+ia-1;
-             // build the list of digits for this module       
-             arg[0]=index;
-             arg[1]=it;
-             arg[2]=idtrack;
-             ListOfFiredCells(arg,timeAmplitude,list,padr);
-       } // loop over time in window 
-      } // end if anodeAmplitude
-    } // loop over anodes in window
-  } // end loop over hits
-
-  Int_t nentries=list->GetEntriesFast();
-  // introduce the electronics effects and do zero-suppression if required
-  if (nentries) {
-    ChargeToSignal(); 
-
-    Option_t *opt=fResponse->ZeroSuppOption();
-    ZeroSuppression(opt);
-  } 
-
-  // clean memory
-  list->Delete();
-  delete list; 
-                      
-  padr->Delete(); 
-
-  fHitMap1->ClearMap();
-  fHitMap2->ClearMap();
-
-  //gObjectTable->Print();
+            // Sigma along the anodes for track segment.
+            sigA       = TMath::Sqrt(2.*dfCoeff*drTime+s1*s1);
+            sigT       = sigA/driftSpeed;
+            // Peak amplitude in nanoAmpere
+            amplitude  = fScaleSize*160.*depEnergy/
+                                 (timeStep*eVpairs*2.*acos(-1.)*sigT*sigA);
+            amplitude *= timeStep/25.; // WARNING!!!!! Amplitude scaling to 
+                                       // account for clock variations 
+                                       // (reference value: 40 MHz)
+            chargeloss = 1.-cHloss*driftPath/1000;
+            amplitude *= chargeloss;
+            width  = 2.*nsigma/(nlookups-1);
+            // Spread the charge 
+            // Pixel index
+            ndiv = 2;
+            nmul = 3.; 
+            if(drTime > 1200.) { 
+                ndiv = 4;
+                nmul = 1.5;
+            } // end if drTime > 1200.
+            // Sub-pixel index
+            nsplit = 4; // hard-wired //nsplit=4;nsplit = (nsplit+1)/2*2;
+            // Sub-pixel size see computation of aExpo and tExpo.
+            aStep  = anodePitch/(nsplit*fScaleSize*sigA);
+            aConst = xAnode*anodePitch/sigA;
+            tStep  = timeStep/(nsplit*fScaleSize*sigT);
+            tConst = drTime/sigT;
+            // Define SDD window corresponding to the hit
+            anodeWindow = (Int_t)(fScaleSize*nsigma*sigA/anodePitch+1);
+            timeWindow  = (Int_t) (fScaleSize*nsigma*sigT/timeStep+1.);
+            jamin = (iAnode - anodeWindow/ndiv - 1)*fScaleSize*nsplit +1;
+            jamax = (iAnode + anodeWindow/ndiv)*fScaleSize*nsplit;
+            if(jamin <= 0) jamin = 1;
+            if(jamax > fScaleSize*nofAnodes*nsplit) 
+                                         jamax = fScaleSize*nofAnodes*nsplit;
+            // jtmin and jtmax are Hard-wired
+            jtmin = (Int_t)(timeSample-timeWindow*nmul-1)*nsplit+1;
+            jtmax = (Int_t)(timeSample+timeWindow*nmul)*nsplit;
+            if(jtmin <= 0) jtmin = 1;
+            if(jtmax > fScaleSize*fMaxNofSamples*nsplit) 
+                                      jtmax = fScaleSize*fMaxNofSamples*nsplit;
+            // Spread the charge in the anode-time window
+            for(ka=jamin; ka <=jamax; ka++) {
+                ia = (ka-1)/(fScaleSize*nsplit) + 1;
+                if(ia <= 0) {
+                    Warning("HitsToAnalogDigits","ia < 1: ");
+                    continue;
+                } // end if
+                if(ia > nofAnodes) ia = nofAnodes;
+                aExpo     = (aStep*(ka-0.5)-aConst);
+                if(TMath::Abs(aExpo) > nsigma)  anodeAmplitude = 0.;
+                else {
+                    dummy          = (Int_t) ((aExpo+nsigma)/width);
+                    anodeAmplitude = amplitude*fResponse->GausLookUp(dummy);
+                } // end if TMath::Abs(aEspo) > nsigma
+                // index starts from 0
+                index = ((detector+1)%2)*nofAnodes+ia-1;
+                if(anodeAmplitude) for(kt=jtmin; kt<=jtmax; kt++) {
+                    it = (kt-1)/nsplit+1;  // it starts from 1
+                    if(it<=0){
+                        Warning("HitsToAnalogDigits","it < 1:");
+                        continue;
+                    } // end if 
+                    if(it>fScaleSize*fMaxNofSamples)
+                                                it = fScaleSize*fMaxNofSamples;
+                    tExpo    = (tStep*(kt-0.5)-tConst);
+                    if(TMath::Abs(tExpo) > nsigma) timeAmplitude = 0.;
+                    else {
+                        dummy         = (Int_t) ((tExpo+nsigma)/width);
+                        timeAmplitude = anodeAmplitude*
+                                        fResponse->GausLookUp(dummy);
+                    } // end if TMath::Abs(tExpo) > nsigma
+                    // build the list of Sdigits for this module        
+//                    arg[0]         = index;
+//                    arg[1]         = it;
+//                    arg[2]         = itrack; // track number
+//                    arg[3]         = ii-1; // hit number.
+                    timeAmplitude *= norm;
+                    timeAmplitude *= 10;
+//                    ListOfFiredCells(arg,timeAmplitude,alst,padr);
+                    Double_t charge = timeAmplitude;
+                    charge += fHitMap2->GetSignal(index,it-1);
+                    fHitMap2->SetHit(index, it-1, charge);
+                    fpList->AddSignal(index,it-1,itrack,ii-1,
+                                     mod->GetIndex(),timeAmplitude);
+                    fAnodeFire[index] = kTRUE;                 
+                } // end if anodeAmplitude and loop over time in window
+            } // loop over anodes in window
+        } // end loop over "sub-hits"
+    } // end loop over hits
 }
 
-
-//____________________________________________
-
+/*
+//______________________________________________________________________
 void AliITSsimulationSDD::ListOfFiredCells(Int_t *arg,Double_t timeAmplitude,
-                                           TObjArray *list,TClonesArray *padr){
-  // Returns the list of "fired" cells.
-
-                    Int_t index=arg[0];
-                    Int_t it=arg[1];
-                    Int_t idtrack=arg[2];
-                    Int_t counter=arg[3];
-                    Int_t countadr=arg[4];
-                   
-                    Int_t digits[3];
-
-                   digits[0]=index;
-                   digits[1]=it-1;
-                   digits[2]=(Int_t)timeAmplitude;
-                    Float_t phys;
-                   if (idtrack >= 0) phys=(Float_t)timeAmplitude;
-                   else phys=0;
-                   
-                    Double_t charge=timeAmplitude;
-                   AliITSTransientDigit* pdigit;
-                   // build the list of fired cells and update the info
-                   if (!fHitMap1->TestHit(index, it-1)) {
-                     
-                       new((*padr)[countadr++]) TVector(2);
-                       TVector &trinfo=*((TVector*) (*padr)[countadr-1]);
-                       trinfo(0)=(Float_t)idtrack;
-                       trinfo(1)=(Float_t)timeAmplitude;
-
-                       list->AddAtAndExpand(
-                           new AliITSTransientDigit(phys,digits),counter);
-                       
-                       fHitMap1->SetHit(index, it-1, counter);
-                       fHitMap2->SetHit(index, it-1, charge);
-                       counter++;
-
-                       pdigit=(AliITSTransientDigit*)list->
-                                                      At(list->GetLast());
-                       // list of tracks
-                       TObjArray *trlist=(TObjArray*)pdigit->TrackList();
-                       trlist->Add(&trinfo);
-
-                   } else {
-                       pdigit=
-                         (AliITSTransientDigit*) fHitMap1->GetHit(index, it-1);
-                        charge += fHitMap2->GetSignal(index,it-1);
-                       fHitMap2->SetHit(index, it-1, charge);
-                       // update charge
-                       (*pdigit).fSignal=(Int_t)charge;
-                       (*pdigit).fPhysics+=phys;                       
-                       // update list of tracks
-                       TObjArray* trlist=(TObjArray*)pdigit->TrackList();
-                       Int_t lastentry=trlist->GetLast();
-                       TVector *ptrkp=(TVector*)trlist->At(lastentry);
-                       TVector &trinfo=*ptrkp;
-                       Int_t lasttrack=Int_t(trinfo(0));
-                       Float_t lastcharge=(trinfo(1));
-                       
-                       if (lasttrack==idtrack ) {
-                           lastcharge+=(Float_t)timeAmplitude;
-                           trlist->RemoveAt(lastentry);
-                           trinfo(0)=lasttrack;
-                           trinfo(1)=lastcharge;
-                           trlist->AddAt(&trinfo,lastentry);
-                       } else {
-                         
-                           new((*padr)[countadr++]) TVector(2);
-                           TVector &trinfo=*((TVector*) (*padr)[countadr-1]);
-                           trinfo(0)=(Float_t)idtrack;
-                           trinfo(1)=(Float_t)timeAmplitude;
-                         
-                           trlist->Add(&trinfo);
-                       }
+                                          TObjArray *alist,TClonesArray *padr){
+    // Returns the list of "fired" cells.
+
+    Int_t index     = arg[0];
+    Int_t ik        = arg[1];
+    Int_t idtrack   = arg[2];
+    Int_t idhit     = arg[3];
+    Int_t counter   = arg[4];
+    Int_t countadr  = arg[5];
+    Double_t charge = timeAmplitude;
+    charge += fHitMap2->GetSignal(index,ik-1);
+    fHitMap2->SetHit(index, ik-1, charge);
+
+    Int_t digits[3];
+    Int_t it = (Int_t)((ik-1)/fScaleSize);
+    digits[0] = index;
+    digits[1] = it;
+    digits[2] = (Int_t)timeAmplitude;
+    Float_t phys;
+    if (idtrack >= 0) phys = (Float_t)timeAmplitude;
+    else phys = 0;
+
+    Double_t cellcharge = 0.;
+    AliITSTransientDigit* pdigit;
+    // build the list of fired cells and update the info
+    if (!fHitMap1->TestHit(index, it)) {
+        new((*padr)[countadr++]) TVector(3);
+        TVector &trinfo=*((TVector*) (*padr)[countadr-1]);
+        trinfo(0) = (Float_t)idtrack;
+        trinfo(1) = (Float_t)idhit;
+        trinfo(2) = (Float_t)timeAmplitude;
+
+        alist->AddAtAndExpand(new AliITSTransientDigit(phys,digits),counter);
+        fHitMap1->SetHit(index, it, counter);
+        counter++;
+        pdigit=(AliITSTransientDigit*)alist->At(alist->GetLast());
+        // list of tracks
+        TObjArray *trlist=(TObjArray*)pdigit->TrackList();
+        trlist->Add(&trinfo);
+    } else {
+        pdigit = (AliITSTransientDigit*) fHitMap1->GetHit(index, it);
+        for(Int_t kk=0;kk<fScaleSize;kk++) {
+            cellcharge += fHitMap2->GetSignal(index,fScaleSize*it+kk);
+        }  // end for kk
+        // update charge
+        (*pdigit).fSignal = (Int_t)cellcharge;
+        (*pdigit).fPhysics += phys;                        
+        // update list of tracks
+        TObjArray* trlist = (TObjArray*)pdigit->TrackList();
+        Int_t lastentry = trlist->GetLast();
+        TVector *ptrkp = (TVector*)trlist->At(lastentry);
+        TVector &trinfo = *ptrkp;
+        Int_t lasttrack = Int_t(trinfo(0));
+        Float_t lastcharge=(trinfo(2));
+        if (lasttrack==idtrack ) {
+            lastcharge += (Float_t)timeAmplitude;
+            trlist->RemoveAt(lastentry);
+            trinfo(0) = lasttrack;
+            trinfo(1) = idhit;
+            trinfo(2) = lastcharge;
+            trlist->AddAt(&trinfo,lastentry);
+        } else {                  
+            new((*padr)[countadr++]) TVector(3);
+            TVector &trinfo=*((TVector*) (*padr)[countadr-1]);
+            trinfo(0) = (Float_t)idtrack;
+            trinfo(1) = (Float_t)idhit;
+            trinfo(2) = (Float_t)timeAmplitude;
+            trlist->Add(&trinfo);
+        } // end if lasttrack==idtrack
 
 #ifdef print
-                       // check the track list - debugging
-                        Int_t trk[50];
-                        Float_t chtrk[50];  
-                       Int_t nptracks=trlist->GetEntriesFast();
-                       if (nptracks > 2) {
-                            Int_t tr;
-                           for(tr=0;tr<nptracks;tr++) {
-                               TVector *pptrkp=(TVector*)trlist->At(tr);
-                               TVector &pptrk=*pptrkp;
-                               trk[tr]=Int_t(pptrk(0));
-                               chtrk[tr]=(pptrk(1));
-                                printf("nptracks %d \n",nptracks);
-                               // set printings
-                           }
-                       } // end if nptracks
+        // check the track list - debugging
+        Int_t trk[20], htrk[20];
+        Float_t chtrk[20];  
+        Int_t nptracks = trlist->GetEntriesFast();
+        if (nptracks > 2) {
+            Int_t tr;
+            for (tr=0;tr<nptracks;tr++) {
+                TVector *pptrkp = (TVector*)trlist->At(tr);
+                TVector &pptrk  = *pptrkp;
+                trk[tr]   = Int_t(pptrk(0));
+                htrk[tr]  = Int_t(pptrk(1));
+                chtrk[tr] = (pptrk(2));
+                cout << "nptracks "<<nptracks << endl;
+            } // end for tr
+        } // end if nptracks
 #endif
-                   } //  end if pdigit
+    } //  end if pdigit
 
-                    arg[3]=counter;
-                    arg[4]=countadr;
+    // update counter and countadr for next call.
+    arg[4] = counter;
+    arg[5] = countadr;
+}
+*/
 
+//____________________________________________
+void AliITSsimulationSDD::AddDigit( Int_t i, Int_t j, Int_t signal ) {
+    // Adds a Digit.
+    Int_t size = AliITSdigitSPD::GetNTracks();
+    Int_t digits[3];
+    Int_t * tracks = new Int_t[size];
+    Int_t * hits = new Int_t[size];
+    Float_t phys;
+    Float_t * charges = new Float_t[size];
+
+    if( fResponse->Do10to8() ) signal = Convert8to10( signal ); 
+    digits[0] = i;
+    digits[1] = j;
+    digits[2] = signal;
+
+    AliITSpListItem *pItem = fpList->GetpListItem( i, j );
+    if( pItem == 0 ) {
+        phys = 0.0;
+        for( Int_t l=0; l<size; l++ ) {
+            tracks[l]  = 0;
+            hits[l]    = 0;
+            charges[l] = 0.0;
+        }
+    } else {
+        Int_t idtrack =  pItem->GetTrack( 0 );
+        if( idtrack >= 0 ) phys = pItem->GetSignal();  
+        else phys = 0.0;
+
+        for( Int_t l=0; l<size; l++ ) if(l<pItem->GetMaxKept()) {
+            tracks[l]  = pItem->GetTrack( l );
+            hits[l]    = pItem->GetHit( l );
+            charges[l] = pItem->GetSignal( l );
+        }else{
+            tracks[l]  = -3;
+            hits[l]    = -1;
+            charges[l] = 0.0;
+       }// end for if
+    }
 
+    fITS->AddSimDigit( 1, phys, digits, tracks, hits, charges ); 
+    delete [] tracks;
+    delete [] hits;
+    delete [] charges;
 }
 
-
+/*
 //____________________________________________
-
 void AliITSsimulationSDD::AddDigit(Int_t i, Int_t j, Int_t signal){
-  // Adds a Digit.
+    // Adds a Digit.
     // tag with -1 signals coming from background tracks
     // tag with -2 signals coming from pure electronic noise
 
-    Int_t digits[3], tracks[3];
+    Int_t digits[3], tracks[3], hits[3];
     Float_t phys, charges[3];
 
-    Int_t trk[20];
+    Int_t trk[20], htrk[20];
     Float_t chtrk[20];  
 
-    signal=Convert8to10(signal); // set a flag in case non-ZS are 10-bit
+    Bool_t do10to8=fResponse->Do10to8();
+
+    if(do10to8) signal=Convert8to10(signal); 
     AliITSTransientDigit *obj = (AliITSTransientDigit*)fHitMap1->GetHit(i,j);
-    digits[0]=i;
-    digits[1]=j;
-    digits[2]=signal;
-    // printf("module anode, time, signal %d %d %d %d\n",fModule,i,j,signal);
+    digits[0] = i;
+    digits[1] = j;
+    digits[2] = signal;
     if (!obj) {
         phys=0;
         Int_t k;
-        for(k=0;k<3;k++) {
-         tracks[k]=-2;
-          charges[k]=0;
-       }
-        fITS->AddDigit(1,phys,digits,tracks,charges); 
+        for (k=0;k<3;k++) {
+            tracks[k]=-2;
+            charges[k]=0;
+            hits[k]=-1;
+        } // end for k
+        fITS->AddSimDigit(1,phys,digits,tracks,hits,charges); 
     } else {
-      phys=obj->fPhysics;
-      //printf("AddDigit - test: fCoord1 fCoord2 fSignal %d %d %d i j signal %d %d %d \n",obj->fCoord1,obj->fCoord2,obj->fSignal,i,j,signal);
-
-      TObjArray* trlist=(TObjArray*)obj->TrackList();
-      Int_t nptracks=trlist->GetEntriesFast();
-
-      if (nptracks > 20) {
-        cout<<"Attention - nptracks > 20 "<<nptracks<<endl;
-        nptracks=20;
-      }
-      Int_t tr;
-      for(tr=0;tr<nptracks;tr++) {
-         TVector &pp  =*((TVector*)trlist->At(tr));
-         trk[tr]=Int_t(pp(0));
-         chtrk[tr]=(pp(1));
-      }
-      if (nptracks > 1) {
-         //printf("AddDigit: nptracks %d\n",nptracks);
-         SortTracks(trk,chtrk,nptracks);
-      }
-      Int_t i;
-      if (nptracks < 3 ) {
-        for(i=0; i<nptracks; i++) {
-            tracks[i]=trk[i];
-            charges[i]=chtrk[i];
-        }
-        for(i=nptracks; i<3; i++) {
-            tracks[i]=0;
-            charges[i]=0;
-        }
-      } else {
-        for(i=0; i<3; i++) {
-            tracks[i]=trk[i];
-            charges[i]=chtrk[i];
-        }
-      }
-
-      fITS->AddDigit(1,phys,digits,tracks,charges); 
+        phys=obj->fPhysics;
+        TObjArray* trlist=(TObjArray*)obj->TrackList();
+        Int_t nptracks=trlist->GetEntriesFast();
+        if (nptracks > 20) {
+            Warning("AddDigit","nptracks=%d > 20 nptracks set to 20",nptracks);
+            nptracks=20;
+        } // end if nptracks > 20
+        Int_t tr;
+        for (tr=0;tr<nptracks;tr++) {
+            TVector &pp  =*((TVector*)trlist->At(tr));
+            trk[tr]=Int_t(pp(0));
+            htrk[tr]=Int_t(pp(1));
+            chtrk[tr]=(pp(2));
+        } // end for tr
+        if (nptracks > 1) {
+            SortTracks(trk,chtrk,htrk,nptracks);
+        } // end if nptracks > 1
+        Int_t i;
+        if (nptracks < 3 ) {
+            for (i=0; i<nptracks; i++) {
+                tracks[i]=trk[i];
+                charges[i]=chtrk[i];
+                hits[i]=htrk[i];
+            } // end for i
+            for (i=nptracks; i<3; i++) {
+                tracks[i]=-3;
+                hits[i]=-1;
+                charges[i]=0;
+            } // end for i
+        } else {
+            for (i=0; i<3; i++) {
+                tracks[i]=trk[i];
+                charges[i]=chtrk[i];
+                hits[i]=htrk[i];
+            } // end for i
+        } // end if/else nptracks < 3
+
+        fITS->AddSimDigit(1,phys,digits,tracks,hits,charges); 
  
-    }
-
+    } // end if/else !obj
 }
 
-//____________________________________________
 
-void AliITSsimulationSDD::SortTracks(Int_t *tracks,Float_t *charges,Int_t ntr){
-  //
-  // Sort the list of tracks contributing to a given digit
-  // Only the 3 most significant tracks are acctually sorted
-  //
-  
-  //
-  //  Loop over signals, only 3 times
-  //
-
-  
-  Float_t qmax;
-  Int_t jmax;
-  Int_t idx[3] = {-3,-3,-3};
-  Float_t jch[3] = {-3,-3,-3};
-  Int_t jtr[3] = {-3,-3,-3};
-  Int_t i,j,imax;
-  
-  if (ntr<3) imax=ntr;
-  else imax=3;
-  for(i=0;i<imax;i++){
-    qmax=0;
-    jmax=0;
+//______________________________________________________________________
+void AliITSsimulationSDD::SortTracks(Int_t *tracks,Float_t *charges,
+                                     Int_t *hits,Int_t ntr){
+    // Sort the list of tracks contributing to a given digit
+    // Only the 3 most significant tracks are acctually sorted
+    //  Loop over signals, only 3 times
+
+    Float_t qmax;
+    Int_t   jmax;
+    Int_t   idx[3]  = {-3,-3,-3};
+    Float_t jch[3]  = {-3,-3,-3};
+    Int_t   jtr[3]  = {-3,-3,-3};
+    Int_t   jhit[3] = {-3,-3,-3};
+    Int_t   i,j,imax;
+
+    if (ntr<3) imax = ntr;
+    else imax = 3;
+    for(i=0;i<imax;i++){
+        qmax = 0;
+        jmax = 0;
+        for(j=0;j<ntr;j++){
+            if((i == 1 && j == idx[i-1] )
+               ||(i == 2 && (j == idx[i-1] || j == idx[i-2]))) continue;
+            if(charges[j] > qmax) {
+                qmax = charges[j];
+                jmax=j;
+            } // end if charges[j]>qmax
+        } // end for j
+        if(qmax > 0) {
+            idx[i]  = jmax;
+            jch[i]  = charges[jmax]; 
+            jtr[i]  = tracks[jmax]; 
+            jhit[i] = hits[jmax]; 
+        } // end if qmax > 0
+    } // end for i
+
+    for(i=0;i<3;i++){
+        if (jtr[i] == -3) {
+            charges[i] = 0;
+            tracks[i]  = -3;
+            hits[i]    = -1;
+        } else {
+            charges[i] = jch[i];
+            tracks[i]  = jtr[i];
+            hits[i]    = jhit[i];
+        } // end if jtr[i] == -3
+    } // end for i
+}
+*/
+//______________________________________________________________________
+void AliITSsimulationSDD::ChargeToSignal(Bool_t bAddNoise) {
+    // add baseline, noise, electronics and ADC saturation effects
+
+    char opt1[20], opt2[20];
+    fResponse->ParamOptions(opt1,opt2);
+    char *read = strstr(opt1,"file");
+    Float_t baseline, noise; 
+
+    if (read) {
+        static Bool_t readfile=kTRUE;
+        //read baseline and noise from file
+        if (readfile) ReadBaseline();
+        readfile=kFALSE;
+    } else fResponse->GetNoiseParam(noise,baseline);
+
+    Float_t contrib=0;
+    Int_t i,k,kk;
+    Float_t maxadc = fResponse->MaxAdc();    
+    if(!fDoFFT) {
+        for (i=0;i<fNofMaps;i++) {
+            if( !fAnodeFire[i] ) continue;
+            if (read && i<fNofMaps) GetAnodeBaseline(i,baseline,noise);
+            for(k=0; k<fScaleSize*fMaxNofSamples; k++) {
+                fInZR[k]  = fHitMap2->GetSignal(i,k);
+                if( bAddNoise ) {
+                    contrib   = (baseline + noise*gRandom->Gaus());
+                    fInZR[k] += contrib;
+                }
+            } // end for k
+            for(k=0; k<fMaxNofSamples; k++) {
+                Double_t newcont = 0.;
+                Double_t maxcont = 0.;
+                for(kk=0;kk<fScaleSize;kk++) {
+                    newcont = fInZR[fScaleSize*k+kk];
+                    if(newcont > maxcont) maxcont = newcont;
+                } // end for kk
+                newcont = maxcont;
+                if (newcont >= maxadc) newcont = maxadc -1;
+                if(newcont >= baseline){
+                    Warning("","newcont=%d>=baseline=%d",newcont,baseline);
+                } // end if
+                // back to analog: ?
+                fHitMap2->SetHit(i,k,newcont);
+            }  // end for k
+        } // end for i loop over anodes
+        return;
+    } // end if DoFFT
+
+    for (i=0;i<fNofMaps;i++) {
+        if( !fAnodeFire[i] ) continue;
+        if  (read && i<fNofMaps) GetAnodeBaseline(i,baseline,noise);
+        for(k=0; k<fScaleSize*fMaxNofSamples; k++) {
+            fInZR[k]  = fHitMap2->GetSignal(i,k);
+            if( bAddNoise ) {
+                contrib   = (baseline + noise*gRandom->Gaus());
+                fInZR[k] += contrib;
+            }
+            fInZI[k]  = 0.;
+        } // end for k
+        FastFourierTransform(fElectronics,&fInZR[0],&fInZI[0],1);
+        for(k=0; k<fScaleSize*fMaxNofSamples; k++) {
+            Double_t rw = fElectronics->GetTraFunReal(k);
+            Double_t iw = fElectronics->GetTraFunImag(k);
+            fOutZR[k]   = fInZR[k]*rw - fInZI[k]*iw;
+            fOutZI[k]   = fInZR[k]*iw + fInZI[k]*rw;
+        } // end for k
+        FastFourierTransform(fElectronics,&fOutZR[0],&fOutZI[0],-1);
+        for(k=0; k<fMaxNofSamples; k++) {
+            Double_t newcont1 = 0.;
+            Double_t maxcont1 = 0.;
+            for(kk=0;kk<fScaleSize;kk++) {
+                newcont1 = fOutZR[fScaleSize*k+kk];
+                if(newcont1 > maxcont1) maxcont1 = newcont1;
+            } // end for kk
+            newcont1 = maxcont1;
+            if (newcont1 >= maxadc) newcont1 = maxadc -1;
+            fHitMap2->SetHit(i,k,newcont1);
+        } // end for k
+    } // end for i loop over anodes
+  return;
+}
+//____________________________________________________________________
+void AliITSsimulationSDD::ApplyDeadChannels() {    
+    // Set dead channel signal to zero
+    AliITSresponseSDD * response = (AliITSresponseSDD *)fResponse;
     
-    for(j=0;j<ntr;j++){
-      
-      if((i == 1 && j == idx[i-1] )
-        ||(i == 2 && (j == idx[i-1] || j == idx[i-2]))) continue;
-      
-      if(charges[j] > qmax) {
-       qmax = charges[j];
-       jmax=j;
-      }       
-    } 
+    // nothing to do
+    if( response->GetDeadModules() == 0 && 
+        response->GetDeadChips() == 0 && 
+        response->GetDeadChannels() == 0 )
+        return;  
     
-    if(qmax > 0) {
-      idx[i]=jmax;
-      jch[i]=charges[jmax]; 
-      jtr[i]=tracks[jmax]; 
-    }
+    static AliITS *iTS = (AliITS*)gAlice->GetModule( "ITS" );
+
+    Int_t fMaxNofSamples = fSegmentation->Npx();    
+    AliITSgeom *geom = iTS->GetITSgeom();
+    Int_t firstSDDMod = geom->GetStartDet( 1 );
+    // loop over wings
+    for( Int_t j=0; j<2; j++ ) {
+        Int_t mod = (fModule-firstSDDMod)*2 + j;
+        for( Int_t u=0; u<response->Chips(); u++ )
+            for( Int_t v=0; v<response->Channels(); v++ ) {
+                Float_t Gain = response->Gain( mod, u, v );
+                for( Int_t k=0; k<fMaxNofSamples; k++ ) {
+                    Int_t i = j*response->Chips()*response->Channels() +
+                              u*response->Channels() + 
+                              v;
+                    Double_t signal =  Gain * fHitMap2->GetSignal( i, k );
+                    fHitMap2->SetHit( i, k, signal );  ///
+                }
+            }
+    }    
+}
+//______________________________________________________________________
+void AliITSsimulationSDD::ApplyCrosstalk() {
+    // function add the crosstalk effect to signal
+    // temporal function, should be checked...!!!
     
-  } 
-  
-  for(i=0;i<3;i++){
-    if (jtr[i] == -3) {
-         charges[i]=0;
-         tracks[i]=0;
-    } else {
-         charges[i]=jch[i];
-         tracks[i]=jtr[i];
+    Int_t fNofMaps = fSegmentation->Npz();
+    Int_t fMaxNofSamples = fSegmentation->Npx();
+
+    // create and inizialice crosstalk map
+    Float_t* ctk = new Float_t[fNofMaps*fMaxNofSamples+1];
+    if( ctk == NULL ) {
+        Error( "ApplyCrosstalk", "no memory for temporal map: exit \n" );
+        return;
     }
-  }
-
-}
-//____________________________________________
-void AliITSsimulationSDD::ChargeToSignal() {
-  // add baseline, noise, electronics and ADC saturation effects
-
-//  Double_t InZR[fMaxNofSamples];
-//  Double_t InZI[fMaxNofSamples];
-//  Double_t OutZR[fMaxNofSamples];
-//  Double_t OutZI[fMaxNofSamples];
-  
-   
-
-
-  Float_t maxadc = fResponse->MaxAdc();    
-  Float_t TopValue = fResponse->MagicValue();
-  Float_t norm = maxadc/TopValue;
-
-
-  Option_t *opt1, *opt2;
-  fResponse->ParamOptions(opt1,opt2);
-  char *read = strstr(opt1,"file");
-
-  Float_t baseline, noise; 
-
-  if (read) {
-      static Bool_t readfile=kTRUE;
-      //read baseline and noise from file
-      if (readfile) ReadBaseline();
-      readfile=kFALSE;
-  } else fResponse->GetNoiseParam(noise,baseline);
-
-  Float_t contrib=0;
-  Bool_t first=kTRUE;
-
-  TRandom *random = new TRandom();
-    Int_t i,k; 
-    for(i=0;i<=fNofMaps;i++) {
-    if  (read) GetAnodeBaseline(i,baseline,noise);
-    if (!first) FastFourierTransform(fElectronics,&fInZR[0],&fInZI[0],1);
-    for(k=0;k<fMaxNofSamples;k++) {
-        if (!first) {
-          // analog to digital ?
-          Double_t signal = fOutZR[k]*norm;
-           if (signal > maxadc) signal = maxadc;
-          // back to analog: ?
-          signal /=norm;
-          //printf("ChargeToSignal: signal %f\n",signal);
-          fHitMap2->SetHit(i-1,k,signal);
-
-          Double_t rw = fElectronics->GetTraFunReal(k);
-          Double_t iw = fElectronics->GetTraFunImag(k);
-          fOutZR[k] = fInZR[k]*rw - fInZI[k]*iw;
-          fOutZI[k] = fInZR[k]*iw + fInZI[k]*rw;
-          if(i+1 < fNofMaps) fInZR[k] = fHitMap2->GetSignal(i+1,k);
-       }
-
-        if (first) {
-             fInZR[k] = fHitMap2->GetSignal(i,k);
-        }
-        fInZI[k] = 0.;
-        // add baseline and noise 
-        contrib = baseline + noise*random->Gaus();
-        fInZR[k] += contrib;
-
-    } // loop over time
+    memset( ctk, 0, sizeof(Float_t)*(fNofMaps*fMaxNofSamples+1) );
+    
+    Float_t noise, baseline;
+    fResponse->GetNoiseParam( noise, baseline );
     
-    if (first) {
-         FastFourierTransform(fElectronics,&fInZR[0],&fInZI[0],1);
-        for(k=0; k<fMaxNofSamples; k++) {
-            Double_t rw = fElectronics->GetTraFunReal(k);
-            Double_t iw = fElectronics->GetTraFunImag(k);
-            fOutZR[k] = fInZR[k]*rw - fInZI[k]*iw;
-            fOutZI[k] = fInZR[k]*iw + fInZI[k]*rw;
-            fInZR[k] = fHitMap2->GetSignal(i+1,k);
-            fInZI[k] = 0.;
-            // add baseline and noise 
-            contrib = baseline + noise*random->Gaus();
-            fInZR[k] += contrib;
-         }
+    for( Int_t z=0; z<fNofMaps; z++ ) {
+        Bool_t on = kFALSE;
+        Int_t tstart = 0;
+        Int_t tstop = 0;
+        Int_t nTsteps = 0;
+        
+        for( Int_t l=0; l<fMaxNofSamples; l++ ) {
+            Float_t fadc = (Float_t)fHitMap2->GetSignal( z, l );
+            if( fadc > baseline ) {
+                if( on == kFALSE && l<fMaxNofSamples-4 ) {
+                    Float_t fadc1 = (Float_t)fHitMap2->GetSignal( z, l+1 );
+                    if( fadc1 < fadc ) continue;
+                    on = kTRUE;
+                    nTsteps = 0;
+                    tstart = l;
+                }
+                nTsteps++;
+            }
+            else { // end fadc > baseline
+                if( on == kTRUE ) {        
+                    if( nTsteps > 2 ) {
+                        tstop = l;
+                        // make smooth derivative
+                        Float_t* dev = new Float_t[fMaxNofSamples+1];
+                        memset( dev, 0, sizeof(Float_t)*(fMaxNofSamples+1) );
+                        if( ctk == NULL ) {
+                            Error( "ApplyCrosstalk", 
+                                   "no memory for temporal array: exit \n" );
+                            return;
+                        }
+                        for( Int_t i=tstart; i<tstop; i++ ) {   
+                            if( i > 2 && i < fMaxNofSamples-2 )
+                                dev[i] = -0.2*fHitMap2->GetSignal( z,i-2 ) 
+                                         -0.1*fHitMap2->GetSignal( z,i-1 ) 
+                                         +0.1*fHitMap2->GetSignal( z,i+1 ) 
+                                         +0.2*fHitMap2->GetSignal( z,i+2 );
+                        }
+                        
+                        // add crosstalk contribution to neibourg anodes  
+                        for( Int_t i=tstart; i<tstop; i++ ) {
+                            Int_t anode = z - 1;
+                            Int_t i1 = (Int_t)((i-tstart)*.61+tstart+0.5); // 
+                            Float_t ctktmp =  -dev[i1] * 0.25;
+                            if( anode > 0 ) {
+                                ctk[anode*fMaxNofSamples+i] += ctktmp;           
+                            }
+                            anode = z + 1;
+                            if( anode < fNofMaps ) {
+                                ctk[anode*fMaxNofSamples+i] += ctktmp;
+                            }
+                        }
+                        delete [] dev;
+                        
+                    } // if( nTsteps > 2 )
+                    on = kFALSE;
+                }  // if( on == kTRUE )
+            }  // else
+        }
     }
-    FastFourierTransform(fElectronics,&fOutZR[0],&fOutZI[0],-1);
-    first = kFALSE;
-  } // loop over anodes
-
+    
+    for( Int_t a=0; a<fNofMaps; a++ )
+        for( Int_t t=0; t<fMaxNofSamples; t++ ) {     
+            Float_t signal = fHitMap2->GetSignal( a, t ) + ctk[a*fMaxNofSamples+t];
+            fHitMap2->SetHit( a, t, signal );
+        }
+    
+    delete [] ctk;
 }
-
-//____________________________________________
+//______________________________________________________________________
 void AliITSsimulationSDD::GetAnodeBaseline(Int_t i,Float_t &baseline,
                                            Float_t &noise){
-  // Returns the Baseline for a particular anode.
-    baseline=fBaseline[i];
-    noise=fNoise[i];
-
+    // Returns the Baseline for a particular anode.
+    baseline = fBaseline[i];
+    noise    = fNoise[i];
 }
-
-//____________________________________________
+//______________________________________________________________________
 void AliITSsimulationSDD::CompressionParam(Int_t i,Int_t &db,Int_t &tl,
                                            Int_t &th){
-  // Returns the compression alogirthm parameters
-   Int_t size = fD.GetSize();
-   if (size > 2 ) {
-      db=fD[i]; tl=fT1[i]; th=fT2[i];
-   } else {
-      if (size <= 2 && i>=fNofMaps/2) {
-       db=fD[1]; tl=fT1[1]; th=fT2[1];
-      } else {
-        db=fD[0]; tl=fT1[0]; th=fT2[0];
-      }
-   }
+    // Returns the compression alogirthm parameters
+    Int_t size = fD.GetSize();
+    if (size > 2 ) {
+        db=fD[i]; tl=fT1[i]; th=fT2[i];
+    } else {
+        if (size <= 2 && i>=fNofMaps/2) {
+            db=fD[1]; tl=fT1[1]; th=fT2[1];
+        } else {
+            db=fD[0]; tl=fT1[0]; th=fT2[0];
+        } // end if size <=2 && i>=fNofMaps/2
+    } // end if size >2
 }
-//____________________________________________
+//______________________________________________________________________
 void AliITSsimulationSDD::CompressionParam(Int_t i,Int_t &db,Int_t &tl){
-  // returns the compression alogirthm parameters
-   Int_t size = fD.GetSize();
-   if (size > 2 ) {
-      db=fD[i]; tl=fT1[i];
-   } else {
-      if (size <= 2 && i>=fNofMaps/2) {
-       db=fD[1]; tl=fT1[1]; 
-      } else {
-        db=fD[0]; tl=fT1[0]; 
-      }
-   }
+    // returns the compression alogirthm parameters
+    Int_t size = fD.GetSize();
 
+    if (size > 2 ) {
+        db=fD[i]; tl=fT1[i];
+    } else {
+        if (size <= 2 && i>=fNofMaps/2) {
+            db=fD[1]; tl=fT1[1]; 
+        } else {
+            db=fD[0]; tl=fT1[0]; 
+        } // end if size <=2 && i>=fNofMaps/2
+    } // end if size > 2
 }
-//____________________________________________
+//______________________________________________________________________
 void AliITSsimulationSDD::SetCompressParam(){
-  // Sets the compression alogirthm parameters  
-   Int_t cp[8],i;
-   
-   fResponse->GiveCompressParam(cp);
-   for(i=0; i<2; i++) {
-       fD[i]  =cp[i];
-       fT1[i] =cp[i+2];
-       fT2[i] =cp[i+4];
-       fTol[i]=cp[i+6];
-       /*
-       printf("\n i, fD, fT1, fT2, fTol %d %d %d %d %d\n",
-                                      i,fD[i],fT1[i],fT2[i],fTol[i]);
-       */
-   }
+    // Sets the compression alogirthm parameters  
+    Int_t cp[8],i;
+
+    fResponse->GiveCompressParam(cp);
+    for (i=0; i<2; i++) {
+        fD[i]   = cp[i];
+        fT1[i]  = cp[i+2];
+        fT2[i]  = cp[i+4];
+        fTol[i] = cp[i+6];
+    } // end for i
 }
-
-//____________________________________________
+//______________________________________________________________________
 void AliITSsimulationSDD::ReadBaseline(){
-      // read baseline and noise from file - either a .root file and in this
-      // case data should be organised in a tree with one entry for each
-      // module => reading should be done accordingly
-      // or a classic file and do smth. like this:
-  //
-  // Read baselines and noise for SDD
-  //
-
+    // read baseline and noise from file - either a .root file and in this
+    // case data should be organised in a tree with one entry for each
+    // module => reading should be done accordingly
+    // or a classic file and do smth. like this:
+    // Read baselines and noise for SDD
 
     Int_t na,pos;
     Float_t bl,n;
-    const char *kinput, *base,*kparam;
+    char input[100], base[100], param[100];
     char *filtmp;
 
-    fResponse->Filenames(kinput,base,kparam);
+    fResponse->Filenames(input,base,param);
     fFileName=base;
 //
     filtmp = gSystem->ExpandPathName(fFileName.Data());
     FILE *bline = fopen(filtmp,"r");
-    printf("filtmp %s\n",filtmp);
     na = 0;
 
     if(bline) {
-       while(fscanf(bline,"%d %f %f",&pos, &bl, &n) != EOF) {
-        //printf("na, pos, bl, n %d %d %f %f\n",na, pos, bl, n);
-          if (pos != na+1) {
-             Error("ReadBaseline","Anode number not in increasing order!",
-                   filtmp);
-             exit(1);
-         }
-          fBaseline[na]=bl;
-          fNoise[na]=n;
-          na++;
-       }
+        while(fscanf(bline,"%d %f %f",&pos, &bl, &n) != EOF) {
+            if (pos != na+1) {
+                Error("ReadBaseline","Anode number not in increasing order!",
+                      filtmp);
+                exit(1);
+            } // end if pos != na+1
+            fBaseline[na]=bl;
+            fNoise[na]=n;
+            na++;
+        } // end while
     } else {
-      Error("ReadBaseline"," THE BASELINE FILE %s DOES NOT EXIST !",
-         filtmp);
-      exit(1);
+        Error("ReadBaseline"," THE BASELINE FILE %s DOES NOT EXIST !",filtmp);
+        exit(1);
     } // end if(bline)
-    
+
     fclose(bline);
     delete [] filtmp;
-
-                        
-} 
-
-//____________________________________________
-Int_t AliITSsimulationSDD::Convert10to8(Int_t signal) {
-  // To the 10 to 8 bit lossive compression.
-  // code from Davide C. and Albert W.
-
-   if (signal < 128)  return signal;
-   if (signal < 256)  return (128+((signal-128)>>1));
-   if (signal < 512)  return (192+((signal-256)>>3));
-   if (signal < 1024) return (224+((signal-512)>>4));
-   return 0;
-
 }
-
-//____________________________________________
-Int_t AliITSsimulationSDD::Convert8to10(Int_t signal) {
-  // Undo the lossive 10 to 8 bit compression.
-  // code from Davide C. and Albert W.
-   if (signal < 0 || signal > 255) {
-       printf("<Convert8to10> out of range %d \n",signal);
-       return 0;
-   }
-   
-   if (signal < 128) return signal;
-   if (signal < 192) {
-     if (TMath::Odd(signal)) return (128+((signal-128)<<1));
-     else  return (128+((signal-128)<<1)+1);
-   }
-   if (signal < 224) {
-     if (TMath::Odd(signal)) return (256+((signal-192)<<3)+3);
-     else  return (256+((signal-192)<<3)+4);
-   }
-   if (TMath::Odd(signal)) return (512+((signal-224)<<4)+7);
-   else  return (512+((signal-224)<<4)+7);
-   return 0;
-
+//______________________________________________________________________
+Int_t AliITSsimulationSDD::Convert10to8(Int_t signal) const {
+    // To the 10 to 8 bit lossive compression.
+    // code from Davide C. and Albert W.
+
+    if (signal < 128)  return signal;
+    if (signal < 256)  return (128+((signal-128)>>1));
+    if (signal < 512)  return (192+((signal-256)>>3));
+    if (signal < 1024) return (224+((signal-512)>>4));
+    return 0;
 }
-
-//____________________________________________
-AliITSMap*   AliITSsimulationSDD::HitMap(Int_t i){
-  //Return the correct map.
-    return ((i==0)? fHitMap1 : fHitMap2);
+//______________________________________________________________________
+Int_t AliITSsimulationSDD::Convert8to10(Int_t signal) const {
+    // Undo the lossive 10 to 8 bit compression.
+    // code from Davide C. and Albert W.
+    if (signal < 0 || signal > 255) {
+        Warning("Convert8to10","out of range signal=%d",signal);
+        return 0;
+    } // end if signal <0 || signal >255
+
+    if (signal < 128) return signal;
+    if (signal < 192) {
+        if (TMath::Odd(signal)) return (128+((signal-128)<<1));
+        else  return (128+((signal-128)<<1)+1);
+    } // end if signal < 192
+    if (signal < 224) {
+        if (TMath::Odd(signal)) return (256+((signal-192)<<3)+3);
+        else  return (256+((signal-192)<<3)+4);
+    } // end if signal < 224
+    if (TMath::Odd(signal)) return (512+((signal-224)<<4)+7);
+    return (512+((signal-224)<<4)+8);
 }
 
+/*
+//______________________________________________________________________
+AliITSMap*   AliITSsimulationSDD::HitMap(Int_t i){
+    //Return the correct map.
 
-//____________________________________________
-void AliITSsimulationSDD::ZeroSuppression(Option_t *option) {
-  // perform the zero suppresion
-  if (strstr(option,"2D")) {
-    //Init2D();              // activate if param change module by module
-    Compress2D();
-  } else if (strstr(option,"1D")) {
-    //Init1D();              // activate if param change module by module
-    Compress1D();  
-  } else StoreAllDigits();  
-
+    return ((i==0)? fHitMap1 : fHitMap2);
+}*/
+
+//______________________________________________________________________
+void AliITSsimulationSDD::ZeroSuppression(const char *option) {
+    // perform the zero suppresion
+
+    if (strstr(option,"2D")) {
+        //Init2D();              // activate if param change module by module
+        Compress2D();
+    } else if (strstr(option,"1D")) {
+        //Init1D();              // activate if param change module by module
+        Compress1D();  
+    } else StoreAllDigits();
 }
-
-//____________________________________________
+//______________________________________________________________________
 void AliITSsimulationSDD::Init2D(){
-     // read in and prepare arrays: fD, fT1, fT2
-     //                         savemu[nanodes], savesigma[nanodes] 
-      // read baseline and noise from file - either a .root file and in this
-      // case data should be organised in a tree with one entry for each
-      // module => reading should be done accordingly
-      // or a classic file and do smth. like this ( code from Davide C. and
-      // Albert W.) :
-  //
-  // Read 2D zero-suppression parameters for SDD
-  //
+    // read in and prepare arrays: fD, fT1, fT2
+    //                         savemu[nanodes], savesigma[nanodes] 
+    // read baseline and noise from file - either a .root file and in this
+    // case data should be organised in a tree with one entry for each
+    // module => reading should be done accordingly
+    // or a classic file and do smth. like this ( code from Davide C. and
+    // Albert W.) :
+    // Read 2D zero-suppression parameters for SDD
 
     if (!strstr(fParam,"file")) return;
 
     Int_t na,pos,tempTh;
     Float_t mu,sigma;
-    Float_t *savemu = new Float_t [fNofMaps];
-        Float_t *savesigma = new Float_t [fNofMaps];
-    const char *kinput,*kbasel,*kpar;
+    Float_t *savemu    = new Float_t [fNofMaps];
+    Float_t *savesigma = new Float_t [fNofMaps];
+    char input[100],basel[100],par[100];
     char *filtmp;
-
-
     Int_t minval = fResponse->MinVal();
 
-    fResponse->Filenames(kinput,kbasel,kpar);
-    fFileName=kpar;
-
+    fResponse->Filenames(input,basel,par);
+    fFileName = par;
 //
     filtmp = gSystem->ExpandPathName(fFileName.Data());
     FILE *param = fopen(filtmp,"r");
     na = 0;
 
     if(param) {
-       while(fscanf(param,"%d %f %f",&pos, &mu, &sigma) != EOF) {
-          if (pos != na+1) {
-             Error("Init2D ","Anode number not in increasing order!",
-                   filtmp);
-             exit(1);
-         }
-          savemu[na]=mu;
-          savesigma[na]=sigma;
+        while(fscanf(param,"%d %f %f",&pos, &mu, &sigma) != EOF) {
+            if (pos != na+1) {
+                Error("Init2D","Anode number not in increasing order!",filtmp);
+                exit(1);
+            } // end if pos != na+1
+            savemu[na] = mu;
+          savesigma[na] = sigma;
           if ((2.*sigma) < mu) {
               fD[na] = (Int_t)floor(mu - 2.0*sigma + 0.5);
               mu = 2.0 * sigma;
-         } else fD[na] = 0;
+          } else fD[na] = 0;
           tempTh = (Int_t)floor(mu+2.25*sigma+0.5) - minval;
           if (tempTh < 0) tempTh=0;
           fT1[na] = tempTh;
@@ -1004,138 +1367,120 @@ void AliITSsimulationSDD::Init2D(){
           if (tempTh < 0) tempTh=0;
           fT2[na] = tempTh;
           na++;
-       } // end while
-
+        } // end while
     } else {
-      Error("Init2D "," THE FILE %s DOES NOT EXIST !",
-         filtmp);
-      exit(1);
+        Error("Init2D","THE FILE %s DOES NOT EXIST !",filtmp);
+        exit(1);
     } // end if(param)
-    
+
     fclose(param);
     delete [] filtmp;
     delete [] savemu;
-        delete [] savesigma;
-        delete savemu;
-        delete savesigma;
-        
-
-
-} 
-//____________________________________________
+    delete [] savesigma;
+}
+//______________________________________________________________________
 void AliITSsimulationSDD::Compress2D(){
-  //
-  // simple ITS cluster finder -- online zero-suppression conditions
-  // 
-  //
-
-  //printf("Compress2D!\n");
+    // simple ITS cluster finder -- online zero-suppression conditions
 
     Int_t db,tl,th;  
-    Int_t minval = fResponse->MinVal();
-    Bool_t write=fResponse->OutputOption();   
-
+    Int_t minval   = fResponse->MinVal();
+    Bool_t write   = fResponse->OutputOption();   
+    Bool_t do10to8 = fResponse->Do10to8();
     Int_t nz, nl, nh, low, i, j; 
 
-    for(i=0; i<fNofMaps; i++) {
+    for (i=0; i<fNofMaps; i++) {
         CompressionParam(i,db,tl,th);
-        nz=0; 
-        nl=0;
-        nh=0;
-        low=0;
-       for(j=0; j<fMaxNofSamples; j++) {
-           Int_t signal=(Int_t)(fHitMap2->GetSignal(i,j));
-           signal -= db; // if baseline eq. is done here
+        nz  = 0; 
+        nl  = 0;
+        nh  = 0;
+        low = 0;
+        for (j=0; j<fMaxNofSamples; j++) {
+            Int_t signal=(Int_t)(fHitMap2->GetSignal(i,j));
+            signal -= db; // if baseline eq. is done here
             if (signal <= 0) {nz++; continue;}
-           if ((signal - tl) < minval) low++;
+            if ((signal - tl) < minval) low++;
             if ((signal - th) >= minval) {
-               nh++;
-               Bool_t cond=kTRUE;
-               //printf("Compress2D : i j %d %d signal %d\n",i,j,signal);
-               FindCluster(i,j,signal,minval,cond);
-           } else if ((signal - tl) >= minval) nl++;
-       } // loop time samples
-       if (write) TreeB()->Fill(nz,nl,nh,low,i+1);
-       //if (nz != 256 && low != 256) printf("i, nz, nl, nh  low %d %d %d %d %d\n",i,nz,nl,nh,low);
-    } // loop anodes  
-
-      char hname[30];
-      if (write) {
-       sprintf(hname,"TNtuple%d_%d",fModule,fEvent);
-       TreeB()->Write(hname);
-       // reset tree
+                nh++;
+                Bool_t cond=kTRUE;
+                FindCluster(i,j,signal,minval,cond);
+                if(cond && j &&
+                   ((TMath::Abs(fHitMap2->GetSignal(i,j-1))-th)>=minval)){
+                    if(do10to8) signal = Convert10to8(signal);
+                    AddDigit(i,j,signal);
+                } // end if cond&&j&&()
+            } else if ((signal - tl) >= minval) nl++;
+        } // end for j loop time samples
+        if (write) TreeB()->Fill(nz,nl,nh,low,i+1);
+    } //end for i loop anodes
+
+    char hname[30];
+    if (write) {
+        sprintf(hname,"TNtuple%d_%d",fModule,fEvent);
+        TreeB()->Write(hname);
+        // reset tree
         TreeB()->Reset();
-      }
-
-} 
-
-//_____________________________________________________________________________
+    } // end if write
+}
+//______________________________________________________________________
 void  AliITSsimulationSDD::FindCluster(Int_t i,Int_t j,Int_t signal,
-                                       Int_t minval,Bool_t cond){
-//
-//  Find clusters according to the online 2D zero-suppression algorithm
-//
-
-    Bool_t high=kFALSE;
+                                       Int_t minval,Bool_t &cond){
+    // Find clusters according to the online 2D zero-suppression algorithm
+    Bool_t do10to8 = fResponse->Do10to8();
+    Bool_t high    = kFALSE;
 
     fHitMap2->FlagHit(i,j);
 //
 //  check the online zero-suppression conditions
 //  
+    const Int_t kMaxNeighbours = 4;
     Int_t nn;
     Int_t dbx,tlx,thx;  
-    Int_t Xlist[kMaxNeighbours], Ylist[kMaxNeighbours];
-    fSegmentation->Neighbours(i,j,&nn,Xlist,Ylist);
-    Int_t in,ix,iy;
-    for(in=0; in<nn; in++) {
-       ix=Xlist[in];
-        iy=Ylist[in];
+    Int_t xList[kMaxNeighbours], yList[kMaxNeighbours];
+    fSegmentation->Neighbours(i,j,&nn,xList,yList);
+    Int_t in,ix,iy,qns;
+    for (in=0; in<nn; in++) {
+        ix=xList[in];
+        iy=yList[in];
         if (fHitMap2->TestHit(ix,iy)==kUnused) {
-          CompressionParam(ix,dbx,tlx,thx);
-           Int_t qn = (Int_t)(fHitMap2->GetSignal(ix,iy));
-          qn -= dbx; // if baseline eq. is done here
-          if ((qn-tlx) < minval) {
-             fHitMap2->FlagHit(ix,iy);
-             continue;
-          } else {
-              if ((qn - thx) >= minval) high=kTRUE;
-              if (cond) {
-                 signal = Convert10to8(signal);
-                //printf("FindCl -cond : i j %d %d signal %d\n",i,j,signal);
-                AddDigit(i,j,signal);
-             }
-             Int_t qns = Convert10to8(qn);
-             //printf("FindCl : i j %d %d qns %d\n",i,j,qns);
-             if (!high) AddDigit(ix,iy,qns);
-             cond=kFALSE;
-             if(!high) fHitMap2->FlagHit(ix,iy);
-          }
-       } // TestHit
-    } // loop over neighbours
-
+            CompressionParam(ix,dbx,tlx,thx);
+            Int_t qn = (Int_t)(fHitMap2->GetSignal(ix,iy));
+            qn -= dbx; // if baseline eq. is done here
+            if ((qn-tlx) < minval) {
+                fHitMap2->FlagHit(ix,iy);
+                continue;
+            } else {
+                if ((qn - thx) >= minval) high=kTRUE;
+                if (cond) {
+                    if(do10to8) signal = Convert10to8(signal);
+                    AddDigit(i,j,signal);
+                } // end if cond
+                if(do10to8) qns = Convert10to8(qn);
+                else qns=qn;
+                if (!high) AddDigit(ix,iy,qns);
+                cond=kFALSE;
+                if(!high) fHitMap2->FlagHit(ix,iy);
+            } // end if qn-tlx < minval
+        } // end if  TestHit
+    } // end for in loop over neighbours
 }
-
-//____________________________________________
+//______________________________________________________________________
 void AliITSsimulationSDD::Init1D(){
-  // this is just a copy-paste of input taken from 2D algo
-  // Torino people should give input
-  //
-  // Read 1D zero-suppression parameters for SDD
-  //
+    // this is just a copy-paste of input taken from 2D algo
+    // Torino people should give input
+    // Read 1D zero-suppression parameters for SDD
 
     if (!strstr(fParam,"file")) return;
 
     Int_t na,pos,tempTh;
     Float_t mu,sigma;
-        Float_t *savemu = new Float_t [fNofMaps];
-        Float_t *savesigma = new Float_t [fNofMaps];
-    const char *kinput,*kbasel,*kpar;
+    Float_t *savemu    = new Float_t [fNofMaps];
+    Float_t *savesigma = new Float_t [fNofMaps];
+    char input[100],basel[100],par[100];
     char *filtmp;
-
-
     Int_t minval = fResponse->MinVal();
-    fResponse->Filenames(kinput,kbasel,kpar);
-    fFileName=kpar;
+
+    fResponse->Filenames(input,basel,par);
+    fFileName=par;
 
 //  set first the disable and tol param
     SetCompressParam();
@@ -1145,277 +1490,300 @@ void AliITSsimulationSDD::Init1D(){
     na = 0;
 
     if (param) {
-          fscanf(param,"%d %d %d %d ", &fT2[0], &fT2[1], &fTol[0], &fTol[1]);
-          while(fscanf(param,"%d %f %f",&pos, &mu, &sigma) != EOF) {
-              if (pos != na+1) {
-                 Error("Init1D ","Anode number not in increasing order!",
-                   filtmp);
-                 exit(1);
-              }
-              savemu[na]=mu;
-              savesigma[na]=sigma;
-              if ((2.*sigma) < mu) {
-                fD[na] = (Int_t)floor(mu - 2.0*sigma + 0.5);
-                mu = 2.0 * sigma;
-              } else fD[na] = 0;
-              tempTh = (Int_t)floor(mu+2.25*sigma+0.5) - minval;
-              if (tempTh < 0) tempTh=0;
-              fT1[na] = tempTh;
-              na++;
-         } // end while
+        fscanf(param,"%d %d %d %d ", &fT2[0], &fT2[1], &fTol[0], &fTol[1]);
+        while(fscanf(param,"%d %f %f",&pos, &mu, &sigma) != EOF) {
+            if (pos != na+1) {
+                Error("Init1D","Anode number not in increasing order!",filtmp);
+                exit(1);
+            } // end if pos != na+1
+            savemu[na]=mu;
+            savesigma[na]=sigma;
+            if ((2.*sigma) < mu) {
+                fD[na] = (Int_t)floor(mu - 2.0*sigma + 0.5);
+                mu = 2.0 * sigma;
+            } else fD[na] = 0;
+            tempTh = (Int_t)floor(mu+2.25*sigma+0.5) - minval;
+            if (tempTh < 0) tempTh=0;
+            fT1[na] = tempTh;
+            na++;
+        } // end while
     } else {
-      Error("Init1D "," THE FILE %s DOES NOT EXIST !",
-         filtmp);
-      exit(1);
+        Error("Init1D","THE FILE %s DOES NOT EXIST !",filtmp);
+        exit(1);
     } // end if(param)
-    
+
     fclose(param);
     delete [] filtmp;
     delete [] savemu;
-        delete [] savesigma;
-        delete savemu;
-        delete savesigma;
-
-}
-//____________________________________________
+    delete [] savesigma;
+} 
+//______________________________________________________________________
 void AliITSsimulationSDD::Compress1D(){
     // 1D zero-suppression algorithm (from Gianluca A.)
-
-    Int_t dis,tol,thres,decr,diff;  
-    //char *dfile=strstr(fParam,"file");
-
+    Int_t    dis,tol,thres,decr,diff;
     UChar_t *str=fStream->Stream();
-    Int_t counter=0;
-
-    Int_t last=0,k,i,j;
-    for(k=1; k<=2; k++) {
-         tol = Tolerance(k-1);
-         dis = Disable(k-1);  
-        for(i=0; i<fNofMaps/2; i++) {
-            Bool_t firstSignal=kTRUE;
-            CompressionParam(k*i,decr,thres); 
-            for(j=0; j<fMaxNofSamples; j++) {
-                Int_t signal=(Int_t)(fHitMap2->GetSignal(k*i,j));
-                 signal -= decr;  // if baseline eq.
-                signal = Convert10to8(signal);
-                if (signal < thres) {
-                     signal=0;
-                     diff=128; 
-                     last=0; 
-                     // write diff in the buffer for HuffT
-                     str[counter]=(UChar_t)diff;
-                     counter++;
-                     continue;
-                }
-                 diff=signal-last;
-                 if (diff > 127) diff=127;
-                 if (diff < -128) diff=-128;
-   
-                if (signal < dis) {
+    Int_t    counter=0;
+    Bool_t   do10to8=fResponse->Do10to8();
+    Int_t    last=0;
+    Int_t    k,i,j;
+
+    for (k=0; k<2; k++) {
+        tol = Tolerance(k);
+        dis = Disable(k);  
+        for (i=0; i<fNofMaps/2; i++) {
+            Bool_t firstSignal=kTRUE;
+            Int_t idx=i+k*fNofMaps/2;
+            if( !fAnodeFire[idx] ) continue;
+            CompressionParam(idx,decr,thres); 
+            for (j=0; j<fMaxNofSamples; j++) {
+                Int_t signal=(Int_t)(fHitMap2->GetSignal(idx,j));
+                signal -= decr;  // if baseline eq.
+                if(do10to8) signal = Convert10to8(signal);
+                if (signal <= thres) {
+                    signal=0;
+                    diff=128; 
+                    last=0; 
+                    // write diff in the buffer for HuffT
+                    str[counter]=(UChar_t)diff;
+                    counter++;
+                    continue;
+                } // end if signal <= thres
+                diff=signal-last;
+                if (diff > 127) diff=127;
+                if (diff < -128) diff=-128;
+                if (signal < dis) {
+                    // tol has changed to 8 possible cases ? - one can write
+                    // this if(TMath::Abs(diff)<tol) ... else ...
+                    if(TMath::Abs(diff)<tol) diff=0;
+                    // or keep it as it was before
+                    /*
                     if (tol==1 && (diff >= -2 && diff <= 1)) diff=0;
                     if (tol==2 && (diff >= -4 && diff <= 3)) diff=0;
                     if (tol==3 && (diff >= -16 && diff <= 15)) diff=0;
-                    AddDigit(k*i,j,last+diff);
-                } else {
-                   AddDigit(k*i,j,signal);
-                }
-                 
-                 diff += 128;
-                 // write diff in the buffer used to compute Huffman tables
-                 if (firstSignal) str[counter]=(UChar_t)signal;
-                else str[counter]=(UChar_t)diff;
-                counter++;
-
-                 last=signal;
-                firstSignal=kFALSE;
-            } // loop time samples
-        } // loop anodes  one half of detector 
-    }
+                    */
+                    AddDigit(idx,j,last+diff);
+                } else {
+                    AddDigit(idx,j,signal);
+                } // end if singal < dis
+                diff += 128;
+                // write diff in the buffer used to compute Huffman tables
+                if (firstSignal) str[counter]=(UChar_t)signal;
+                else str[counter]=(UChar_t)diff;
+                counter++;
+                last=signal;
+                firstSignal=kFALSE;
+            } // end for j loop time samples
+        } // end for i loop anodes  one half of detector 
+    } //  end for k
 
     // check
     fStream->CheckCount(counter);
 
     // open file and write out the stream of diff's
-   
     static Bool_t open=kTRUE;
-    static TFile *OutFile;
+    static TFile *outFile;
     Bool_t write = fResponse->OutputOption();
+    TDirectory *savedir = gDirectory;
  
     if (write ) {
-       if(open) {
-           SetFileName("stream.root");
-           cout<<"filename "<<fFileName<<endl;
-           OutFile=new TFile(fFileName,"recreate");
-           cout<<"I have opened "<<fFileName<<" file "<<endl;
-       }           
-       open=kFALSE;
-       OutFile->cd();
+        if(open) {
+            SetFileName("stream.root");
+            cout<<"filename "<<fFileName<<endl;
+            outFile=new TFile(fFileName,"recreate");
+            cout<<"I have opened "<<fFileName<<" file "<<endl;
+        } // end if open
+        open = kFALSE;
+        outFile->cd();
         fStream->Write();
-    }  // endif write  
-
-     fStream->ClearStream();
-
-     // back to galice.root file
+    }  // endif write        
 
-     TTree *fAli=gAlice->TreeK();
-     TFile *file = 0;
-           
-     if (fAli) file =fAli->GetCurrentFile();
-     file->cd();
+    fStream->ClearStream();
 
-
-} 
-//____________________________________________
+    // back to galice.root file
+    if(savedir) savedir->cd();
+}
+//______________________________________________________________________
 void AliITSsimulationSDD::StoreAllDigits(){
-  // if non-zero-suppressed data
-
-    Int_t digits[3],i,j;
-
-    for(i=0; i<fNofMaps; i++) {
-        for(j=0; j<fMaxNofSamples; j++) {
-             Int_t signal=(Int_t)(fHitMap2->GetSignal(i,j));
-            signal = Convert10to8(signal);
-            signal = Convert8to10(signal); // ?
-             digits[0]=i;
-             digits[1]=j;
-             digits[2]=signal;
-             fITS->AddRealDigit(1,digits);
-       }
-    }
+    // if non-zero-suppressed data
+    Bool_t do10to8 = fResponse->Do10to8();
+    Int_t i, j, digits[3];
+
+    for (i=0; i<fNofMaps; i++) {
+        for (j=0; j<fMaxNofSamples; j++) {
+            Int_t signal=(Int_t)(fHitMap2->GetSignal(i,j));
+            if(do10to8) signal = Convert10to8(signal);
+            if(do10to8) signal = Convert8to10(signal); 
+            digits[0] = i;
+            digits[1] = j;
+            digits[2] = signal;
+            fITS->AddRealDigit(1,digits);
+        } // end for j
+    } // end for i
 } 
-//____________________________________________
-
-void AliITSsimulationSDD::CreateHistograms(){
-  // Creates histograms of maps for debugging
-
-      Int_t i;
-      for(i=0;i<fNofMaps;i++) {
-          TString *sddName = new TString("sdd_");
-          Char_t candNum[4];
-          sprintf(candNum,"%d",i+1);
-          sddName->Append(candNum);
-          (*fHis)[i] = new TH1F(sddName->Data(),"SDD maps",
-                              fMaxNofSamples,0.,(Float_t) fMaxNofSamples);
-          delete sddName;
-      }
+//______________________________________________________________________
+void AliITSsimulationSDD::CreateHistograms(Int_t scale){
+    // Creates histograms of maps for debugging
+    Int_t i;
 
+      fHis=new TObjArray(fNofMaps);
+      for (i=0;i<fNofMaps;i++) {
+           TString sddName("sdd_");
+           Char_t candNum[4];
+           sprintf(candNum,"%d",i+1);
+           sddName.Append(candNum);
+           fHis->AddAt(new TH1F(sddName.Data(),"SDD maps",scale*fMaxNofSamples,
+                                0.,(Float_t) scale*fMaxNofSamples), i);
+      } // end for i
 }
-//____________________________________________
-
+//______________________________________________________________________
+void AliITSsimulationSDD::FillHistograms(){
+    // fill 1D histograms from map
+
+    if (!fHis) return;
+
+    for( Int_t i=0; i<fNofMaps; i++) {
+        TH1F *hist =(TH1F *)fHis->UncheckedAt(i);
+        Int_t nsamples = hist->GetNbinsX();
+        for( Int_t j=0; j<nsamples; j++) {
+            Double_t signal=fHitMap2->GetSignal(i,j);
+            hist->Fill((Float_t)j,signal);
+        } // end for j
+    } // end for i
+}
+//______________________________________________________________________
 void AliITSsimulationSDD::ResetHistograms(){
-    //
     // Reset histograms for this detector
-    //
     Int_t i;
-    for(i=0;i<fNofMaps;i++ ) {
-       if ((*fHis)[i])    ((TH1F*)(*fHis)[i])->Reset();
-    }
 
+    for (i=0;i<fNofMaps;i++ ) {
+        if (fHis->At(i))    ((TH1F*)fHis->At(i))->Reset();
+    } // end for i
 }
+//______________________________________________________________________
+TH1F *AliITSsimulationSDD::GetAnode(Int_t wing, Int_t anode) { 
+    // Fills a histogram from a give anode.  
 
+    if (!fHis) return 0;
 
-//____________________________________________
+    if(wing <=0 || wing > 2) {
+        Warning("GetAnode","Wrong wing number: %d",wing);
+        return NULL;
+    } // end if wing <=0 || wing >2
+    if(anode <=0 || anode > fNofMaps/2) {
+        Warning("GetAnode","Wrong anode number: %d",anode);
+        return NULL;
+    } // end if ampde <=0 || andoe > fNofMaps/2
 
-TH1F *AliITSsimulationSDD::GetAnode(Int_t wing, Int_t anode) { 
-  // Fills a histogram from a give anode.  
-  if (!fHis) return 0;
-
-  if(wing <=0 || wing > 2) {
-    cout << "Wrong wing number: " << wing << endl;
-    return NULL;
-  }
-  if(anode <=0 || anode > fNofMaps/2) {
-    cout << "Wrong anode number: " << anode << endl;
-    return NULL;
-  }
-
-  Int_t index = (wing-1)*fNofMaps/2 + anode-1;
-  return (TH1F*)((*fHis)[index]); 
+    Int_t index = (wing-1)*fNofMaps/2 + anode-1;
+    return (TH1F*)(fHis->At(index));
 }
-
-//____________________________________________
-
+//______________________________________________________________________
 void AliITSsimulationSDD::WriteToFile(TFile *hfile) {
-  // Writes the histograms to a file 
-  if (!fHis) return;
+    // Writes the histograms to a file
 
-  hfile->cd();
-  Int_t i;
-  for(i=0; i<fNofMaps; i++)  (*fHis)[i]->Write(); //fAdcs[i]->Write();
-  return;
+    if (!fHis) return;
+
+    hfile->cd();
+    Int_t i;
+    for(i=0; i<fNofMaps; i++)  fHis->At(i)->Write(); //fAdcs[i]->Write();
+    return;
 }
-//____________________________________________
-Float_t AliITSsimulationSDD::GetNoise(Float_t threshold) {  
-  // Returns the noise value
-  if (!fHis) return 0.;
-
-  TH1F *noisehist = new TH1F("noisehist","noise",100,0.,threshold);
-  Int_t i,k;
-  for(i=0;i<fNofMaps;i++) {
-    Int_t nOfBinsA = ((TH1F*)(*fHis)[i])->GetNbinsX();
-    for(k=0;k<nOfBinsA;k++) {
-      Float_t content = ((TH1F*)(*fHis)[i])->GetBinContent(k+1);
-      if (content < threshold) noisehist->Fill(content);
+//______________________________________________________________________
+Float_t AliITSsimulationSDD::GetNoise() {  
+    // Returns the noise value
+    //Bool_t do10to8=fResponse->Do10to8();
+    //noise will always be in the liniar part of the signal
+    Int_t decr;
+    Int_t threshold = fT1[0];
+    char opt1[20], opt2[20];
+
+    fResponse->ParamOptions(opt1,opt2);
+    fParam=opt2;
+    char *same = strstr(opt1,"same");
+    Float_t noise,baseline;
+    if (same) {
+        fResponse->GetNoiseParam(noise,baseline);
+    } else {
+        static Bool_t readfile=kTRUE;
+        //read baseline and noise from file
+        if (readfile) ReadBaseline();
+        readfile=kFALSE;
+    } // end if same
+
+    TCanvas *c2 = (TCanvas*)gROOT->GetListOfCanvases()->FindObject("c2");
+    if(c2) delete c2->GetPrimitive("noisehist");
+    if(c2) delete c2->GetPrimitive("anode");
+    else     c2=new TCanvas("c2");
+    c2->cd();
+    c2->SetFillColor(0);
+
+    TH1F *noisehist = new TH1F("noisehist","noise",100,0.,(float)2*threshold);
+    TH1F *anode = new TH1F("anode","Anode Projection",fMaxNofSamples,0.,
+                           (float)fMaxNofSamples);
+    Int_t i,k;
+    for (i=0;i<fNofMaps;i++) {
+        CompressionParam(i,decr,threshold); 
+        if  (!same) GetAnodeBaseline(i,baseline,noise);
+        anode->Reset();
+        for (k=0;k<fMaxNofSamples;k++) {
+            Float_t signal=(Float_t)fHitMap2->GetSignal(i,k);
+            //if (signal <= (float)threshold) noisehist->Fill(signal-baseline);
+            if (signal <= (float)threshold) noisehist->Fill(signal);
+            anode->Fill((float)k,signal);
+        } // end for k
+        anode->Draw();
+        c2->Update();
+    } // end for i
+    TF1 *gnoise = new TF1("gnoise","gaus",0.,threshold);
+    noisehist->Fit("gnoise","RQ");
+    noisehist->Draw();
+    c2->Update();
+    Float_t mnoise = gnoise->GetParameter(1);
+    cout << "mnoise : " << mnoise << endl;
+    Float_t rnoise = gnoise->GetParameter(2);
+    cout << "rnoise : " << rnoise << endl;
+    delete noisehist;
+    return rnoise;
+}
+//______________________________________________________________________
+void AliITSsimulationSDD::WriteSDigits(){
+    // Fills the Summable digits Tree
+    static AliITS *aliITS = (AliITS*)gAlice->GetModule("ITS");
+
+    for( Int_t i=0; i<fNofMaps; i++ ) {
+        if( !fAnodeFire[i] ) continue;
+        for( Int_t j=0; j<fMaxNofSamples; j++ ) {
+            Double_t sig = fHitMap2->GetSignal( i, j );
+            if( sig > 0.2 ) {
+                Int_t jdx = j*fScaleSize;
+                Int_t index = fpList->GetHitIndex( i, j );
+                AliITSpListItem pItemTmp2( fModule, index, 0. );
+                // put the fScaleSize analog digits in only one
+                for( Int_t ik=0; ik<fScaleSize; ik++ ) {
+                    AliITSpListItem *pItemTmp = fpList->GetpListItem( i, jdx+ik );
+                    if( pItemTmp == 0 ) continue;
+                    pItemTmp2.Add( pItemTmp );
+                }
+                pItemTmp2.AddSignalAfterElect( fModule, index, sig );
+                pItemTmp2.AddNoise( fModule, index, fHitNoiMap2->GetSignal( i, j ) );         
+                aliITS->AddSumDigit( pItemTmp2 );
+            } // end if (sig > 0.2)
+        }
     }
-  }
-  TF1 *gnoise = new TF1("gnoise","gaus",0.,threshold);
-  noisehist->Fit("gnoise","RQ");
-  noisehist->Draw();
-  Float_t mnoise = gnoise->GetParameter(1);
-  cout << "mnoise : " << mnoise << endl;
-  Float_t rnoise = gnoise->GetParameter(2);
-  cout << "rnoise : " << rnoise << endl;
-  delete noisehist;
-  return rnoise;
+    return;
 }
-void AliITSsimulationSDD::Streamer(TBuffer &R__b)
-{
-   // Stream an object of class AliITSsimulationSDD.
-
-   if (R__b.IsReading()) {
-      Version_t R__v = R__b.ReadVersion(); if (R__v) { }
-      AliITSsimulation::Streamer(R__b);
-      R__b >> fITS;
-      R__b >> fHitMap1;
-      R__b >> fHitMap2;
-      R__b >> fStream;
-      R__b >> fElectronics;
-      fD.Streamer(R__b);
-      fT1.Streamer(R__b);
-      fT2.Streamer(R__b);
-      fTol.Streamer(R__b);
-      fBaseline.Streamer(R__b);
-      fNoise.Streamer(R__b);
-      R__b >> fTreeB;
-      //R__b.ReadArray(fParam); // Not to be printed out?
-      fFileName.Streamer(R__b);
-      R__b >> fNofMaps;
-      R__b >> fMaxNofSamples;
-      R__b >> fModule;
-      R__b >> fEvent;
-      R__b >> fHis;
-   } else {
-      R__b.WriteVersion(AliITSsimulationSDD::IsA());
-      AliITSsimulation::Streamer(R__b);
-      R__b << fITS;
-      R__b << fHitMap1;
-      R__b << fHitMap2;
-      R__b << fStream;
-      R__b << fElectronics;
-      fD.Streamer(R__b);
-      fT1.Streamer(R__b);
-      fT2.Streamer(R__b);
-      fTol.Streamer(R__b);
-      fBaseline.Streamer(R__b);
-      fNoise.Streamer(R__b);
-      R__b << fTreeB;
-      //R__b.WriteArray(fParam, __COUNTER__); // Not to be printed out?
-      fFileName.Streamer(R__b);
-      R__b << fNofMaps;
-      R__b << fMaxNofSamples;
-      R__b << fModule;
-      R__b << fEvent;
-      R__b << fHis;
-   }
+//______________________________________________________________________
+void AliITSsimulationSDD::Print() {
+    // Print SDD simulation Parameters
+
+    cout << "**************************************************" << endl;
+    cout << "   Silicon Drift Detector Simulation Parameters   " << endl;
+    cout << "**************************************************" << endl;
+    cout << "Flag for Perpendicular tracks: " << (Int_t) fFlag << endl;
+    cout << "Flag for noise checking: " << (Int_t) fCheckNoise << endl;
+    cout << "Flag to switch off electronics: " << (Int_t) fDoFFT << endl;
+    cout << "Number pf Anodes used: " << fNofMaps << endl;
+    cout << "Number of Time Samples: " << fMaxNofSamples << endl;
+    cout << "Scale size factor: " << fScaleSize << endl;
+    cout << "**************************************************" << endl;
 }