X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSsimulationSPD.cxx;h=9c9a4d6b613b74bdb3b333fea48546229e337fdb;hb=6d64cce3e519d7e242b33e116dbbb4b2ef539127;hp=740048c9c30191df7e9a5f2b0be99e91f341d2c0;hpb=5bfe44ce3c357f2a8aaf552cf58664574d760a8b;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITSsimulationSPD.cxx b/ITS/AliITSsimulationSPD.cxx index 740048c9c30..9c9a4d6b613 100644 --- a/ITS/AliITSsimulationSPD.cxx +++ b/ITS/AliITSsimulationSPD.cxx @@ -1,32 +1,28 @@ /************************************************************************** - * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * - * * - * Author: The ALICE Off-line Project. * - * Contributors are mentioned in the code where appropriate. * - * * - * Permission to use, copy, modify and distribute this software and its * - * documentation strictly for non-commercial purposes is hereby granted * - * without fee, provided that the above copyright notice appears in all * - * copies and that both the copyright notice and this permission notice * - * appear in the supporting documentation. The authors make no claims * - * about the suitability of this software for any purpose. It is * - * provided "as is" without express or implied warranty. * - **************************************************************************/ +* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * +* * +* Author: The ALICE Off-line Project. * +* Contributors are mentioned in the code where appropriate. * +* * +* Permission to use, copy, modify and distribute this software and its * +* documentation strictly for non-commercial purposes is hereby granted * +* without fee, provided that the above copyright notice appears in all * +* copies and that both the copyright notice and this permission notice * +* appear in the supporting documentation. The authors make no claims * +* about the suitability of this software for any purpose. It is * +* provided "as is" without express or implied warranty. * +**************************************************************************/ /* $Id$ */ #include +#include #include -#include -#include -#include #include #include "AliITS.h" -#include "AliITSMapA2.h" #include "AliITSdigitSPD.h" -#include "AliITSgeom.h" #include "AliITShit.h" #include "AliITSmodule.h" #include "AliITSpList.h" @@ -35,14 +31,18 @@ $Id$ #include "AliITSsimulationSPD.h" #include "AliLog.h" #include "AliRun.h" +#include "AliMagF.h" +#include "AliMathBase.h" //#define DEBUG ClassImp(AliITSsimulationSPD) //////////////////////////////////////////////////////////////////////// // Version: 1 -// Modified by Bjorn S. Nilsen, G.E. Bruno, H. Tydesjo +// Modified by D. Elia, G.E. Bruno, H. Tydesjo +// Fast diffusion code by Bjorn S. Nilsen // March-April 2006 +// October 2007: GetCalibrationObjects() removed // // Version: 0 // Written by Boris Batyunya @@ -58,16 +58,21 @@ AliITSsimulationSPD::AliITSsimulationSPD(): AliITSsimulation(), fHis(0), fSPDname(), -fCoupling(){ - // Default constructor. - // Inputs: - // none. - // Outputs: - // none. - // Return: - // A default constructed AliITSsimulationSPD class. - - AliDebug(1,Form("Calling default constructor")); +fCoupling(), +fLorentz(kFALSE), +fTanLorAng(0), +fStrobe(kTRUE), +fStrobeLenght(4), +fStrobePhase(-12.5e-9){ + // Default constructor. + // Inputs: + // none. + // Outputs: + // none. + // Return: + // A default constructed AliITSsimulationSPD class. + + AliDebug(1,Form("Calling default constructor")); // Init(); } //______________________________________________________________________ @@ -75,623 +80,689 @@ AliITSsimulationSPD::AliITSsimulationSPD(AliITSDetTypeSim *dettyp): AliITSsimulation(dettyp), fHis(0), fSPDname(), -fCoupling(){ - // standard constructor - // Inputs: - // AliITSsegmentation *seg A pointer to the segmentation class - // to be used for this simulation - // AliITSCalibration *resp A pointer to the responce class to - // be used for this simulation - // Outputs: - // none. - // Return: - // A default constructed AliITSsimulationSPD class. - - AliDebug(1,Form("Calling standard constructor ")); -// AliITSCalibrationSPD* res = (AliITSCalibrationSPD*)GetCalibrationModel(fDetType->GetITSgeom()->GetStartSPD()); -// res->SetTemperature(0.0); -// res->SetDistanceOverVoltage(0.0); - Init(); +fCoupling(), +fLorentz(kFALSE), +fTanLorAng(0), +fStrobe(kTRUE), +fStrobeLenght(4), +fStrobePhase(-12.5e-9){ + // standard constructor + // Inputs: + // AliITSsegmentation *seg A pointer to the segmentation class + // to be used for this simulation + // AliITSCalibration *resp A pointer to the responce class to + // be used for this simulation + // Outputs: + // none. + // Return: + // A default constructed AliITSsimulationSPD class. + + AliDebug(1,Form("Calling standard constructor ")); + Init(); } //______________________________________________________________________ void AliITSsimulationSPD::Init(){ - // Initilization - // Inputs: - // none. - // Outputs: - // none. - // Return: - // none. - const Double_t kmictocm = 1.0e-4; // convert microns to cm. - - SetModuleNumber(0); - SetEventNumber(0); - SetMap(new AliITSpList(GetNPixelsZ(),GetNPixelsX())); - AliITSCalibrationSPD* res = (AliITSCalibrationSPD*)GetCalibrationModel(fDetType->GetITSgeom()->GetStartSPD()); - AliITSsegmentationSPD* seg = (AliITSsegmentationSPD*)GetSegmentationModel(0); - Double_t bias = res->GetBiasVoltage(); + // Initilization + // Inputs: + // none. + // Outputs: + // none. + // Return: + // none. + const Double_t kmictocm = 1.0e-4; // convert microns to cm. + + SetModuleNumber(0); + SetEventNumber(0); + SetMap(new AliITSpList(GetNPixelsZ(),GetNPixelsX())); + AliITSSimuParam* simpar = fDetType->GetSimuParam(); + AliITSsegmentationSPD* seg = (AliITSsegmentationSPD*)GetSegmentationModel(0); + Double_t bias = simpar->GetSPDBiasVoltage(); // cout << "Bias Voltage --> " << bias << endl; // dom - res->SetDistanceOverVoltage(kmictocm*seg->Dy(),bias); + simpar->SetDistanceOverVoltage(kmictocm*seg->Dy(),bias); // set kind of coupling ("old" or "new") - char opt[20]; - res->GetCouplingOption(opt); - char *old = strstr(opt,"old"); - if (old) { - fCoupling=2; - } else { - fCoupling=1; - } // end if - - // Get the calibration objects for each module(ladder) - GetCalibrationObjects(0); //RunNr 0 hard coded for now - + char opt[20]; + simpar->GetSPDCouplingOption(opt); + char *old = strstr(opt,"old"); + if (old) { + fCoupling=2; + } else { + fCoupling=1; + } // end if + SetLorentzDrift(simpar->GetSPDLorentzDrift()); + if (fLorentz) SetTanLorAngle(simpar->GetSPDLorentzHoleWeight()); + //SetStrobeGeneration(kFALSE); + if (fStrobe) GenerateStrobePhase(); +} +//______________________________________________________________________ +Bool_t AliITSsimulationSPD::SetTanLorAngle(Double_t WeightHole) { + // This function set the Tangent of the Lorentz angle. + // A weighted average is used for electrons and holes + // Input: Double_t WeightHole: wheight for hole: it should be in the range [0,1] + // output: Bool_t : kTRUE in case of success + // + if(!fDetType) { + AliError("AliITSsimulationSPD::SetTanLorAngle: AliITSDetTypeSim* fDetType not set "); + return kFALSE;} + if(WeightHole<0) { + WeightHole=0.; + AliWarning("AliITSsimulationSPD::SetTanLorAngle: You have asked for negative Hole weight"); + AliWarning("AliITSsimulationSPD::SetTanLorAngle: I'm going to use only electrons"); + } + if(WeightHole>1) { + WeightHole=1.; + AliWarning("AliITSsimulationSPD::SetTanLorAngle: You have asked for weight > 1"); + AliWarning("AliITSsimulationSPD::SetTanLorAngle: I'm going to use only holes"); + } + Double_t WeightEle=1.-WeightHole; + AliITSSimuParam* simpar = fDetType->GetSimuParam(); + AliMagF* fld = (AliMagF*)TGeoGlobalMagField::Instance()->GetField(); + if (!fld) AliFatal("The field is not initialized"); + Double_t bz = fld->SolenoidField(); + fTanLorAng = TMath::Tan(WeightHole*simpar->LorentzAngleHole(bz) + + WeightEle*simpar->LorentzAngleElectron(bz)); + return kTRUE; } //______________________________________________________________________ AliITSsimulationSPD::~AliITSsimulationSPD(){ - // destructor - // Inputs: - // none. - // Outputs: - // none. - // Return: - // none. - - if (fHis) { - fHis->Delete(); - delete fHis; - } // end if fHis + // destructor + // Inputs: + // none. + // Outputs: + // none. + // Return: + // none. + + if (fHis) { + fHis->Delete(); + delete fHis; + } // end if fHis } //______________________________________________________________________ AliITSsimulationSPD::AliITSsimulationSPD(const AliITSsimulationSPD - &s) : AliITSsimulation(s){ - // Copy Constructor - // Inputs: - // AliITSsimulationSPD &s The original class for which - // this class is a copy of - // Outputs: - // none. - // Return: - - *this = s; - return; + &s) : AliITSsimulation(s), +fHis(s.fHis), +fSPDname(s.fSPDname), +fCoupling(s.fCoupling), +fLorentz(s.fLorentz), +fTanLorAng(s.fTanLorAng), +fStrobe(s.fStrobe), +fStrobeLenght(s.fStrobeLenght), +fStrobePhase(s.fStrobePhase){ + // Copy Constructor + // Inputs: + // AliITSsimulationSPD &s The original class for which + // this class is a copy of + // Outputs: + // none. + // Return: + } //______________________________________________________________________ AliITSsimulationSPD& AliITSsimulationSPD::operator=(const - AliITSsimulationSPD &s){ - // Assignment operator - // Inputs: - // AliITSsimulationSPD &s The original class for which - // this class is a copy of - // Outputs: - // none. - // Return: - - if(&s == this) return *this; - this->fHis = s.fHis; - fCoupling = s.fCoupling; - fSPDname = s.fSPDname; - return *this; + AliITSsimulationSPD &s){ + // Assignment operator + // Inputs: + // AliITSsimulationSPD &s The original class for which + // this class is a copy of + // Outputs: + // none. + // Return: + + if(&s == this) return *this; + this->fHis = s.fHis; + fCoupling = s.fCoupling; + fSPDname = s.fSPDname; + fLorentz = s.fLorentz; + fTanLorAng = s.fTanLorAng; + fStrobe = s.fStrobe; + fStrobeLenght = s.fStrobeLenght; + fStrobePhase = s.fStrobePhase; + return *this; } +/* //______________________________________________________________________ AliITSsimulation& AliITSsimulationSPD::operator=(const - AliITSsimulation &s){ - // Assignment operator - // Inputs: - // AliITSsimulationSPD &s The original class for which - // this class is a copy of - // Outputs: - // none. - // Return: - - if(&s == this) return *this; - Error("AliITSsimulationSPD","Not allowed to make a = with " - "AliITSsimulationSPD","Using default creater instead"); - - return *this; -} + AliITSsimulation &s){ + // Assignment operator + // Inputs: + // AliITSsimulationSPD &s The original class for which + // this class is a copy of + // Outputs: + // none. + // Return: -//______________________________________________________________________ -void AliITSsimulationSPD::GetCalibrationObjects(Int_t RunNr) { - AliCDBManager* man = AliCDBManager::Instance(); - if(!man->IsDefaultStorageSet()) { - man->SetDefaultStorage("local://$ALICE_ROOT"); - } - AliCDBEntry *entrySPD = man->Get("ITS/Calib/CalibSPD", RunNr); - if(!entrySPD){ - AliWarning("Cannot find SPD calibration entry!"); - return; - } - TObjArray *respSPD = (TObjArray *)entrySPD->GetObject(); - if ((! respSPD)) { - AliWarning("Cannot get data from SPD database entry!"); - return; - } - for (Int_t mod=0; mod<240; mod++) { - calObj[mod] = (AliITSCalibrationSPD*) respSPD->At(mod); - } -} + if(&s == this) return *this; + Error("AliITSsimulationSPD","Not allowed to make a = with " + "AliITSsimulationSPD","Using default creater instead"); + return *this; +} +*/ //______________________________________________________________________ void AliITSsimulationSPD::InitSimulationModule(Int_t module, Int_t event){ - // This function creates maps to build the list of tracks for each - // summable digit. Inputs defined by base class. - // Inputs: - // Int_t module // Module number to be simulated - // Int_t event // Event number to be simulated - // Outputs: - // none - // Returns: - // none - - AliDebug(1,Form("(module=%d,event=%d)",module,event)); - SetModuleNumber(module); - SetEventNumber(event); - ClearMap(); + // This function creates maps to build the list of tracks for each + // summable digit. Inputs defined by base class. + // Inputs: + // Int_t module // Module number to be simulated + // Int_t event // Event number to be simulated + // Outputs: + // none + // Returns: + // none + + AliDebug(1,Form("(module=%d,event=%d)",module,event)); + const Double_t kmictocm = 1.0e-4; // convert microns to cm. + AliITSSimuParam* simpar = fDetType->GetSimuParam(); + AliITSsegmentationSPD* seg = (AliITSsegmentationSPD*)GetSegmentationModel(0); + SetModuleNumber(module); + SetEventNumber(event); + simpar->SetDistanceOverVoltage(kmictocm*seg->Dy(),simpar->GetSPDBiasVoltage(module)); + ClearMap(); } //_____________________________________________________________________ void AliITSsimulationSPD::SDigitiseModule(AliITSmodule *mod,Int_t, - Int_t event){ - // This function begins the work of creating S-Digits. Inputs defined - // by base class. - // Inputs: - // AliITSmodule *mod // module - // Int_t // not used - // Int_t event // Event number - // Outputs: - // none - // Return: - // test // test returns kTRUE if the module contained hits - // // test returns kFALSE if it did not contain hits - - AliDebug(1,Form("(mod=%p, ,event=%d)",mod,event)); - if(!(mod->GetNhits())){ - AliDebug(1,Form("In event %d module %d there are %d hits returning.", + Int_t event){ + // This function begins the work of creating S-Digits. Inputs defined + // by base class. + // Inputs: + // AliITSmodule *mod // module + // Int_t // not used + // Int_t event // Event number + // Outputs: + // none + // Return: + // test // test returns kTRUE if the module contained hits + // // test returns kFALSE if it did not contain hits + + AliDebug(1,Form("(mod=%p, ,event=%d)",mod,event)); + if(!(mod->GetNhits())){ + AliDebug(1,Form("In event %d module %d there are %d hits returning.", event, mod->GetIndex(),mod->GetNhits())); - return;// if module has no hits don't create Sdigits - } // end if - SetModuleNumber(mod->GetIndex()); - SetEventNumber(event); - // HitToSDigit(mod); - HitToSDigitFast(mod); - WriteSDigits(); - ClearMap(); + return;// if module has no hits don't create Sdigits + } // end if + SetModuleNumber(mod->GetIndex()); + if (fStrobe) if(event != GetEventNumber()) GenerateStrobePhase(); + SetEventNumber(event); + InitSimulationModule( GetModuleNumber() , event ); + // HitToSDigit(mod); + HitToSDigitFast(mod); + if (fDetType->GetSimuParam()->GetSPDAddNoisyFlag()) AddNoisyPixels(); + if (fDetType->GetSimuParam()->GetSPDRemoveDeadFlag()) RemoveDeadPixels(); + +// cout << "After Remove in SDigitiseModule !!!!!" << endl; // dom +// cout << "Module " << mod->GetIndex() << " Event " << event << endl; // dom + WriteSDigits(); + ClearMap(); } //______________________________________________________________________ void AliITSsimulationSPD::WriteSDigits(){ - // This function adds each S-Digit to pList - // Inputs: - // none. - // Outputs: - // none. - // Return: - // none - Int_t ix, nix, iz, niz; - static AliITS *aliITS = (AliITS*)gAlice->GetModule("ITS"); - - AliDebug(1,Form("Writing SDigits for module %d",GetModuleNumber())); - GetMap()->GetMaxMapIndex(niz, nix); - for(iz=0; izGetSignalOnly(iz,ix)>0.0){ - aliITS->AddSumDigit(*(GetMap()->GetpListItem(iz,ix))); + // This function adds each S-Digit to pList + // Inputs: + // none. + // Outputs: + // none. + // Return: + // none + Int_t ix, nix, iz, niz; + static AliITS *aliITS = (AliITS*)gAlice->GetModule("ITS"); + + AliDebug(1,Form("Writing SDigits for module %d",GetModuleNumber())); +// cout << "WriteSDigits for module " << GetModuleNumber() << endl; // dom + GetMap()->GetMaxMapIndex(niz, nix); + for(iz=0; izGetSignalOnly(iz,ix)>0.0){ +// cout << " Signal gt 0 iz ix " << iz << ix << " Module " << GetModuleNumber() << endl; // dom + aliITS->AddSumDigit(*(GetMap()->GetpListItem(iz,ix))); if(AliDebugLevel()>0) { AliDebug(1,Form("%d, %d",iz,ix)); cout << *(GetMap()->GetpListItem(iz,ix)) << endl; - } // end if GetDebug - } // end if GetMap()->GetSignalOnly(iz,ix)>0.0 - } // end for iz,ix - return; + } // end if GetDebug + } // end if GetMap()->GetSignalOnly(iz,ix)>0.0 + } // end for iz,ix + return; } //______________________________________________________________________ void AliITSsimulationSPD::FinishSDigitiseModule(){ - // This function calls SDigitsToDigits which creates Digits from SDigits - // Inputs: - // none - // Outputs: - // none - // Return - // none - - AliDebug(1,"()"); - pListToDigits(); // Charge To Signal both adds noise and - ClearMap(); - return; + // This function calls SDigitsToDigits which creates Digits from SDigits + // Inputs: + // none + // Outputs: + // none + // Return + // none + + AliDebug(1,"()"); +// cout << "FinishSDigitiseModule for module " << GetModuleNumber() << endl; // dom + FrompListToDigits(); // Charge To Signal both adds noise and + ClearMap(); + return; } //______________________________________________________________________ void AliITSsimulationSPD::DigitiseModule(AliITSmodule *mod,Int_t, - Int_t){ - // This function creates Digits straight from the hits and then adds - // electronic noise to the digits before adding them to pList - // Each of the input variables is passed along to HitToSDigit - // Inputs: - // AliITSmodule *mod module - // Int_t Dummy. - // Int_t Dummy - // Outputs: - // none. - // Return: - // none. - - AliDebug(1,Form("(mod=%p,,)",mod)); - // HitToSDigit(mod); - HitToSDigitFast(mod); - RemoveDeadPixels(mod); - pListToDigits(); - ClearMap(); + Int_t event){ + // This function creates Digits straight from the hits and then adds + // electronic noise to the digits before adding them to pList + // Each of the input variables is passed along to HitToSDigit + // Inputs: + // AliITSmodule *mod module + // Int_t Dummy. + // Int_t Dummy + // Outputs: + // none. + // Return: + // none. + + if (fStrobe) if(event != GetEventNumber()) GenerateStrobePhase(); + AliDebug(1,Form("(mod=%p,,0)",mod)); + // HitToSDigit(mod); + InitSimulationModule( mod->GetIndex(), event ); + HitToSDigitFast(mod); + + if (fDetType->GetSimuParam()->GetSPDAddNoisyFlag()) AddNoisyPixels(); + if (fDetType->GetSimuParam()->GetSPDRemoveDeadFlag()) RemoveDeadPixels(); +// cout << "After Remove in DigitiseModule in module " << mod->GetIndex() << endl; // dom + FrompListToDigits(); + ClearMap(); } //______________________________________________________________________ void AliITSsimulationSPD::HitToSDigit(AliITSmodule *mod){ - // Does the charge distributions using Gaussian diffusion charge charing. - // Inputs: - // AliITSmodule *mod Pointer to this module - // Output: - // none. - // Return: - // none. - const Double_t kmictocm = 1.0e-4; // convert microns to cm. - TObjArray *hits = mod->GetHits(); - Int_t nhits = hits->GetEntriesFast(); - Int_t h,ix,iz,i; - Int_t idtrack; - Double_t x0=0.0,x1=0.0,y0=0.0,y1=0.0,z0=0.0,z1=0.0,de=0.0; - Double_t x,y,z,t,tp,st,dt=0.2,el,sig,sigx,sigz,fda; - AliITSsegmentationSPD* seg = (AliITSsegmentationSPD*)GetSegmentationModel(0); - AliITSCalibrationSPD* res = (AliITSCalibrationSPD*)GetCalibrationModel(fDetType->GetITSgeom()->GetStartSPD()); - Double_t thick = 0.5*kmictocm*seg->Dy(); // Half Thickness - res->GetSigmaDiffusionAsymmetry(fda); - - AliDebug(1,Form("(mod=%p) fCoupling=%d",mod,fCoupling)); - if(nhits<=0) return; - for(h=0;h0) { + // Does the charge distributions using Gaussian diffusion charge charing. + // Inputs: + // AliITSmodule *mod Pointer to this module + // Output: + // none. + // Return: + // none. + const Double_t kmictocm = 1.0e-4; // convert microns to cm. + const Double_t kBunchLenght = 25e-9; // LHC clock + TObjArray *hits = mod->GetHits(); + Int_t nhits = hits->GetEntriesFast(); + Int_t h,ix,iz,i; + Int_t idtrack; + Double_t x0=0.0,x1=0.0,y0=0.0,y1=0.0,z0=0.0,z1=0.0,de=0.0,ld=0.0; + Double_t x,y,z,t,tp,st,dt=0.2,el,sig,sigx,sigz,fda; + AliITSsegmentationSPD* seg = (AliITSsegmentationSPD*)GetSegmentationModel(0); + AliITSSimuParam *simpar = fDetType->GetSimuParam(); + Double_t thick = 0.5*kmictocm*seg->Dy(); // Half Thickness + simpar->GetSPDSigmaDiffusionAsymmetry(fda); // + + AliDebug(1,Form("(mod=%p) fCoupling=%d",mod,fCoupling)); + if(nhits<=0) return; + for(h=0;h0) { AliDebug(1,Form("Hits, %d", h)); cout << *(mod->GetHit(h)) << endl; - } // end if GetDebug - if(!mod->LineSegmentL(h,x0,x1,y0,y1,z0,z1,de,idtrack)) continue; - st = TMath::Sqrt(x1*x1+y1*y1+z1*z1); - if(st>0.0){ - st = (Double_t)((Int_t)(st/kmictocm)); // number of microns - if(st<=1.0) st = 1.0; - dt = 1.0/st; - for(t=0.0;t<1.0;t+=dt){ // Integrate over t - tp = t+0.5*dt; - x = x0+x1*tp; - y = y0+y1*tp; - z = z0+z1*tp; - if(!(seg->LocalToDet(x,z,ix,iz))) continue; // outside - el = res->GeVToCharge((Double_t)(dt*de)); - if(GetDebug(1)){ - if(el<=0.0) cout<<"el="<LocalToDet(x,z,ix,iz))) continue; // outside - el = res->GeVToCharge((Double_t)de); - sig = res->SigmaDiffusion1D(TMath::Abs(thick + y)); - // SpreadCharge(x,z,ix,iz,el,sig,idtrack,h); - sigx=sig; - sigz=sig*fda; - SpreadChargeAsym(x,z,ix,iz,el,sigx,sigz,idtrack,h); - } // end if st>0.0 - // Coupling - switch (fCoupling) { - default: - break; - case 1: //case 3: - // x is column and z is row (see AliITSsegmentationSPD::GetPadIxz) - for(i=0;iGetEntries();i++) - if(GetMap()->GetpListItem(i)==0) continue; - else{ - GetMap()->GetMapIndex( - GetMap()->GetpListItem(i)->GetIndex(),iz,ix); - SetCoupling(iz,ix,idtrack,h); - } // end for i - break; - case 2: // case 4: - // x is column and z is row (see AliITSsegmentationSPD::GetPadIxz) - for(i=0;iGetEntries();i++) - if(GetMap()->GetpListItem(i)==0) continue; - else{ - GetMap()->GetMapIndex( - GetMap()->GetpListItem(i)->GetIndex(),iz,ix); - SetCouplingOld(iz,ix,idtrack,h); - } // end for i - break; - } // end switch - } // Loop over all hits h - if(GetDebug(2))Info("HitToSDigit","Finished fCoupling=%d",fCoupling); + } // end if GetDebug + // Check if the hit is inside readout window + if (fStrobe) + if ((mod->GetHit(h)->GetTOF() < fStrobePhase) || + (mod->GetHit(h)->GetTOF() > (fStrobePhase+(Double_t)fStrobeLenght*kBunchLenght))) continue; + if(!mod->LineSegmentL(h,x0,x1,y0,y1,z0,z1,de,idtrack)) continue; + st = TMath::Sqrt(x1*x1+y1*y1+z1*z1); + if(st>0.0){ + st = (Double_t)((Int_t)(st/kmictocm)); // number of microns + if(st<=1.0) st = 1.0; + dt = 1.0/st; + for(t=0.0;t<1.0;t+=dt){ // Integrate over t + tp = t+0.5*dt; + x = x0+x1*tp; + y = y0+y1*tp; + z = z0+z1*tp; + if(!(seg->LocalToDet(x,z,ix,iz))) continue; // outside + //el = res->GeVToCharge((Double_t)(dt*de)); + el = dt * de / simpar->GetGeVToCharge(); + if(GetDebug(1)){ + if(el<=0.0) cout<<"el="<GetHits(); - Int_t nhits = hits->GetEntriesFast(); - Int_t h,ix,iz,i; - Int_t idtrack; - Double_t x0=0.0,x1=0.0,y0=0.0,y1=0.0,z0=0.0,z1=0.0,de=0.0; - Double_t x,y,z,t,st,el,sig,sigx,sigz,fda; - AliITSsegmentationSPD* seg = (AliITSsegmentationSPD*)GetSegmentationModel(0); - AliITSCalibrationSPD* res = (AliITSCalibrationSPD*)GetCalibrationModel(fDetType->GetITSgeom()->GetStartSPD()); - Double_t thick = 0.5*kmictocm*seg->Dy(); // Half thickness - res->GetSigmaDiffusionAsymmetry(fda); + // Does the charge distributions using Gaussian diffusion charge charing. // Inputs: + // AliITSmodule *mod Pointer to this module + // Output: + // none. + // Return: + // none. + const Double_t kmictocm = 1.0e-4; // convert microns to cm. + const Int_t kn10=10; + const Double_t kti[kn10]={7.443716945e-3,2.166976971e-1,3.397047841e-1, + 4.325316833e-1,4.869532643e-1,5.130467358e-1, + 5.674683167e-1,6.602952159e-1,7.833023029e-1, + 9.255628306e-1}; + const Double_t kwi[kn10]={1.477621124e-1,1.346333597e-1,1.095431813e-1, + 7.472567455e-2,3.333567215e-2,3.333567215e-2, + 7.472567455e-2,1.095431813e-1,1.346333597e-1, + 1.477621124e-1}; + const Double_t kBunchLenght = 25e-9; // LHC clock + TObjArray *hits = mod->GetHits(); + Int_t nhits = hits->GetEntriesFast(); + Int_t h,ix,iz,i; + Int_t idtrack; + Double_t x0=0.0,x1=0.0,y0=0.0,y1=0.0,z0=0.0,z1=0.0,de=0.0,ld=0.0; + Double_t x,y,z,t,st,el,sig,sigx,sigz,fda; + AliITSsegmentationSPD* seg = (AliITSsegmentationSPD*)GetSegmentationModel(0); + AliITSSimuParam* simpar = fDetType->GetSimuParam(); + Double_t thick = 0.5*kmictocm*seg->Dy(); // Half thickness + simpar->GetSPDSigmaDiffusionAsymmetry(fda); // cout << "Half Thickness " << thick << endl; // dom // cout << "Diffusion asymm " << fda << endl; // dom - AliDebug(1,Form("(mod=%p) fCoupling=%d",mod,fCoupling)); - if(nhits<=0) return; - for(h=0;h0) { - AliDebug(1,Form("Hits, %d", h)); - cout << *(mod->GetHit(h)) << endl; - } // end if GetDebug - if(!mod->LineSegmentL(h,x0,x1,y0,y1,z0,z1,de,idtrack)) continue; - st = TMath::Sqrt(x1*x1+y1*y1+z1*z1); - if(st>0.0) for(i=0;iLocalToDet(x,z,ix,iz))) continue; // outside - // el = res->GeVToCharge((Double_t)(dt*de)); - // el = 1./n10*res->GeVToCharge((Double_t)de); - el = wi[i]*res->GeVToCharge((Double_t)de); - if(GetDebug(1)){ - if(el<=0.0) cout<<"el="<LocalToDet(x,z,ix,iz))) continue; // outside - el = res->GeVToCharge((Double_t)de); - sig = res->SigmaDiffusion1D(TMath::Abs(thick + y)); - //SpreadCharge(x,z,ix,iz,el,sig,idtrack,h); - sigx=sig; - sigz=sig*fda; - SpreadChargeAsym(x,z,ix,iz,el,sigx,sigz,idtrack,h); - } // end if st>0.0 - // Coupling - switch (fCoupling) { - default: - break; - case 1: // case 3: - // x is column and z is row (see AliITSsegmentationSPD::GetPadIxz) - for(i=0;iGetEntries();i++) - if(GetMap()->GetpListItem(i)==0) continue; - else{ - GetMap()->GetMapIndex( - GetMap()->GetpListItem(i)->GetIndex(),iz,ix); - SetCoupling(iz,ix,idtrack,h); - } // end for i - break; - case 2: // case 4: - // x is column and z is row (see AliITSsegmentationSPD::GetPadIxz) - for(i=0;iGetEntries();i++) - if(GetMap()->GetpListItem(i)==0) continue; - else{ - GetMap()->GetMapIndex( - GetMap()->GetpListItem(i)->GetIndex(),iz,ix); SetCouplingOld(iz,ix,idtrack,h); - } // end for i - break; - } // end switch - } // Loop over all hits h - if(GetDebug(2))Info("HitToSDigit","Finished fCoupling=%d",fCoupling); + AliDebug(1,Form("(mod=%p) fCoupling=%d",mod,fCoupling)); + if(nhits<=0) return; + for(h=0;h0) { + AliDebug(1,Form("Hits, %d", h)); + cout << *(mod->GetHit(h)) << endl; + } // end if GetDebug + // Check if the hit is inside readout window + if (fStrobe) + if ((mod->GetHit(h)->GetTOF() < fStrobePhase) || + (mod->GetHit(h)->GetTOF() > (fStrobePhase+(Double_t)fStrobeLenght*kBunchLenght))) continue; + if(!mod->LineSegmentL(h,x0,x1,y0,y1,z0,z1,de,idtrack)) continue; + st = TMath::Sqrt(x1*x1+y1*y1+z1*z1); + if(st>0.0) for(i=0;iLocalToDet(x,z,ix,iz))) continue; // outside + el = kwi[i]*de/simpar->GetGeVToCharge(); + if(GetDebug(1)){ + if(el<=0.0) cout<<"el="<LocalToDet(x,z,ix,iz))) continue; // outside + el = de / simpar->GetGeVToCharge(); + sig = simpar->SigmaDiffusion1D(TMath::Abs(thick + y)); + sigx=sig; + sigz=sig*fda; + if (fLorentz) ld=(y+thick)*fTanLorAng; + SpreadChargeAsym(x,z,ix,iz,el,sigx,sigz,ld,idtrack,h); + } // end if st>0.0 + + } // Loop over all hits h + + // Coupling + switch (fCoupling) { + default: + break; + case 1: // case 3: + for(i=0;iGetEntries();i++) + if(GetMap()->GetpListItem(i)==0) continue; + else{ + GetMap()->GetMapIndex(GetMap()->GetpListItem(i)->GetIndex(),iz,ix); + SetCoupling(iz,ix,idtrack,h); + } // end for i + break; + case 2: // case 4: + for(i=0;iGetEntries();i++) + if(GetMap()->GetpListItem(i)==0) continue; + else{ + GetMap()->GetMapIndex(GetMap()->GetpListItem(i)->GetIndex(),iz,ix); + SetCouplingOld(iz,ix,idtrack,h); + } // end for i + break; + } // end switch + if(GetDebug(2))Info("HitToSDigit","Finished fCoupling=%d",fCoupling); } //______________________________________________________________________ void AliITSsimulationSPD::SpreadCharge(Double_t x0,Double_t z0, - Int_t ix0,Int_t iz0, - Double_t el,Double_t sig,Int_t t, - Int_t hi){ - // Spreads the charge over neighboring cells. Assume charge is distributed - // as charge(x,z) = (el/2*pi*sig*sig)*exp(-arg) - // arg=((x-x0)*(x-x0)/2*sig*sig)+((z-z0*z-z0)/2*sig*sig) - // Defined this way, the integral over all x and z is el. - // Inputs: - // Double_t x0 x position of point where charge is liberated - // Double_t y0 y position of point where charge is liberated - // Double_t z0 z position of point where charge is liberated - // Int_t ix0 row of cell corresponding to point x0 - // Int_t iz0 columb of cell corresponding to point z0 - // Double_t el number of electrons liberated in this step - // Double_t sig Sigma difusion for this step (y0 dependent) - // Int_t t track number - // Int_t ti hit track index number - // Int_t hi hit "hit" index number - // Outputs: - // none. - // Return: - // none. - const Int_t knx = 3,knz = 2; - const Double_t kRoot2 = 1.414213562; // Sqrt(2). - const Double_t kmictocm = 1.0e-4; // convert microns to cm. - Int_t ix,iz,ixs,ixe,izs,ize; - Float_t x,z; - Double_t x1,x2,z1,z2,s,sp; - AliITSsegmentationSPD* seg = (AliITSsegmentationSPD*)GetSegmentationModel(0); - - - if(GetDebug(4)) Info("SpreadCharge","(x0=%e,z0=%e,ix0=%d,iz0=%d,el=%e," - "sig=%e,t=%d,i=%d)",x0,z0,ix0,iz0,el,sig,t,hi); - if(sig<=0.0) { // if sig<=0 No diffusion to simulate. - GetMap()->AddSignal(iz0,ix0,t,hi,GetModuleNumber(),el); - if(GetDebug(2)){ - cout << "sig<=0.0=" << sig << endl; - } // end if GetDebug - return; - } // end if - sp = 1.0/(sig*kRoot2); - if(GetDebug(2)){ - cout << "sig=" << sig << " sp=" << sp << endl; - } // end if GetDebug - ixs = TMath::Max(-knx+ix0,0); - ixe = TMath::Min(knx+ix0,seg->Npx()-1); - izs = TMath::Max(-knz+iz0,0); - ize = TMath::Min(knz+iz0,seg->Npz()-1); - for(ix=ixs;ix<=ixe;ix++) for(iz=izs;iz<=ize;iz++){ - seg->DetToLocal(ix,iz,x,z); // pixel center - x1 = x; - z1 = z; - x2 = x1 + 0.5*kmictocm*seg->Dpx(ix); // Upper - x1 -= 0.5*kmictocm*seg->Dpx(ix); // Lower - z2 = z1 + 0.5*kmictocm*seg->Dpz(iz); // Upper - z1 -= 0.5*kmictocm*seg->Dpz(iz); // Lower - x1 -= x0; // Distance from where track traveled - x2 -= x0; // Distance from where track traveled - z1 -= z0; // Distance from where track traveled - z2 -= z0; // Distance from where track traveled - s = 0.25; // Correction based on definision of Erfc - s *= TMath::Erfc(sp*x1) - TMath::Erfc(sp*x2); - if(GetDebug(3)){ - cout <<"el="<AddSignal(iz0,ix0,t,hi,GetModuleNumber(),el); + if(GetDebug(2)){ + cout << "sig<=0.0=" << sig << endl; + } // end if GetDebug + return; + } // end if + sp = 1.0/(sig*kRoot2); + if(GetDebug(2)){ + cout << "sig=" << sig << " sp=" << sp << endl; + } // end if GetDebug + ixs = TMath::Max(-knx+ix0,0); + ixe = TMath::Min(knx+ix0,seg->Npx()-1); + izs = TMath::Max(-knz+iz0,0); + ize = TMath::Min(knz+iz0,seg->Npz()-1); + for(ix=ixs;ix<=ixe;ix++) for(iz=izs;iz<=ize;iz++){ + seg->DetToLocal(ix,iz,x,z); // pixel center + x1 = x; + z1 = z; + x2 = x1 + 0.5*kmictocm*seg->Dpx(ix); // Upper + x1 -= 0.5*kmictocm*seg->Dpx(ix); // Lower + z2 = z1 + 0.5*kmictocm*seg->Dpz(iz); // Upper + z1 -= 0.5*kmictocm*seg->Dpz(iz); // Lower + x1 -= x0+ld; // Distance from where track traveled (taking into account the Lorentz drift) + x2 -= x0+ld; // Distance from where track traveled (taking into account the Lorentz drift) + z1 -= z0; // Distance from where track traveled + z2 -= z0; // Distance from where track traveled + s = 0.25; // Correction based on definision of Erfc + s *= AliMathBase::ErfcFast(sp*x1) - AliMathBase::ErfcFast(sp*x2); + if(GetDebug(3)){ + cout <<"el="<AddSignal(iz0,ix0,t,hi,GetModuleNumber(),el); - if(GetDebug(2)){ - cout << "sigx<=0.0=" << sigx << endl; - cout << "sigz<=0.0=" << sigz << endl; - } // end if GetDebug - return; - } // end if - spx = 1.0/(sigx*kRoot2); spz = 1.0/(sigz*kRoot2); - if(GetDebug(2)){ - cout << "sigx=" << sigx << " spx=" << spx << endl; - cout << "sigz=" << sigz << " spz=" << spz << endl; - } // end if GetDebug - ixs = TMath::Max(-knx+ix0,0); - ixe = TMath::Min(knx+ix0,seg->Npx()-1); - izs = TMath::Max(-knz+iz0,0); - ize = TMath::Min(knz+iz0,seg->Npz()-1); - for(ix=ixs;ix<=ixe;ix++) for(iz=izs;iz<=ize;iz++){ - seg->DetToLocal(ix,iz,x,z); // pixel center - x1 = x; - z1 = z; - x2 = x1 + 0.5*kmictocm*seg->Dpx(ix); // Upper - x1 -= 0.5*kmictocm*seg->Dpx(ix); // Lower - z2 = z1 + 0.5*kmictocm*seg->Dpz(iz); // Upper - z1 -= 0.5*kmictocm*seg->Dpz(iz); // Lower - x1 -= x0; // Distance from where track traveled - x2 -= x0; // Distance from where track traveled - z1 -= z0; // Distance from where track traveled - z2 -= z0; // Distance from where track traveled - s = 0.25; // Correction based on definision of Erfc - s *= TMath::Erfc(spx*x1) - TMath::Erfc(spx*x2); - if(GetDebug(3)){ - cout <<"el="<AddSignal(iz0,ix0,t,hi,GetModuleNumber(),el); + if(GetDebug(2)){ + cout << "sigx<=0.0=" << sigx << endl; + cout << "sigz<=0.0=" << sigz << endl; + } // end if GetDebug + return; + } // end if + spx = 1.0/(sigx*kRoot2); spz = 1.0/(sigz*kRoot2); + if(GetDebug(2)){ + cout << "sigx=" << sigx << " spx=" << spx << endl; + cout << "sigz=" << sigz << " spz=" << spz << endl; + } // end if GetDebug + ixs = TMath::Max(-knx+ix0,0); + ixe = TMath::Min(knx+ix0,seg->Npx()-1); + izs = TMath::Max(-knz+iz0,0); + ize = TMath::Min(knz+iz0,seg->Npz()-1); + for(ix=ixs;ix<=ixe;ix++) for(iz=izs;iz<=ize;iz++){ + seg->DetToLocal(ix,iz,x,z); // pixel center + x1 = x; + z1 = z; + x2 = x1 + 0.5*kmictocm*seg->Dpx(ix); // Upper + x1 -= 0.5*kmictocm*seg->Dpx(ix); // Lower + z2 = z1 + 0.5*kmictocm*seg->Dpz(iz); // Upper + z1 -= 0.5*kmictocm*seg->Dpz(iz); // Lower + x1 -= x0+ld; // Distance from where track traveled (taking into account the Lorentz drift) + x2 -= x0+ld; // Distance from where track traveled (taking into account the Lorentz drift) + z1 -= z0; // Distance from where track traveled + z2 -= z0; // Distance from where track traveled + s = 0.25; // Correction based on definision of Erfc + s *= AliMathBase::ErfcFast(spx*x1) - AliMathBase::ErfcFast(spx*x2); + if(GetDebug(3)){ + cout <<"el="<GetITSgeom()->GetStartSPD()); - if(GetDebug(1)) Info("pListToDigits","()"); - for(iz=0; izGetModule("ITS"); + Int_t j,ix,iz; + Double_t electronics; + Double_t sig; + const Int_t knmaxtrk=AliITSdigit::GetNTracks(); + static AliITSdigitSPD dig; + AliITSSimuParam *simpar = fDetType->GetSimuParam(); + if(GetDebug(1)) Info("FrompListToDigits","()"); + for(iz=0; izRndm() >= eff) continue; // } // end if - // END parametrize the efficiency - // - electronics = res->ApplyBaselineAndNoise(); - UpdateMapNoise(ix,iz,electronics); - // - // Apply Threshold and write Digits. - sig = GetMap()->GetSignalOnly(iz,ix); - FillHistograms(ix,iz,sig+electronics); - if(GetDebug(3)){ - cout<threshold("<GetpListItem(iz,ix))<AddSimDigit(0,&dig); - } // for ix/iz +// END parametrize the efficiency +// + electronics = simpar->ApplySPDBaselineAndNoise(); + UpdateMapNoise(ix,iz,electronics); + // + // Apply Threshold and write Digits. + sig = GetMap()->GetSignalOnly(iz,ix); + FillHistograms(ix,iz,sig+electronics); + if(GetDebug(3)){ + cout<threshold("<GetNEntries()) { + dig.SetTrack(j,GetMap()->GetTrack(iz,ix,j)); + dig.SetHit(j,GetMap()->GetHit(iz,ix,j)); + }else { // Default values + dig.SetTrack(j,-3); + dig.SetHit(j,-1); + } // end if GetMap() + } // end for j + if(GetDebug(3)){ + cout<GetpListItem(iz,ix))<AddSimDigit(0,&dig); + // simulate fo signal response for this pixel hit: + fDetType->ProcessSPDDigitForFastOr(fModule, dig.GetCoord1(), dig.GetCoord2()); + } // for ix/iz } //______________________________________________________________________ void AliITSsimulationSPD::CreateHistograms(){ - // create 1D histograms for tests - // Inputs: - // none. - // Outputs: - // none. - // Return: - // none. - - if(GetDebug(1)) Info("CreateHistograms","create histograms"); - - fHis = new TObjArray(GetNPixelsZ()); - TString fSPDname("spd_"); - for(Int_t i=0;iAddAt(new TH1F(fSPDname.Data(),"SPD maps", - GetNPixelsX(),0.,(Double_t)GetNPixelsX()),i); - } // end for i + // create 1D histograms for tests + // Inputs: + // none. + // Outputs: + // none. + // Return: + // none. + + if(GetDebug(1)) Info("CreateHistograms","create histograms"); + + fHis = new TObjArray(GetNPixelsZ()); + fSPDname="spd_"; + for(Int_t i=0;iAddAt(new TH1F(fSPDname.Data(),"SPD maps", + GetNPixelsX(),0.,(Double_t)GetNPixelsX()),i); + } // end for i } //______________________________________________________________________ void AliITSsimulationSPD::FillHistograms(Int_t ix,Int_t iz,Double_t v){ - // Fill the histogram - // Inputs: - // none. - // Outputs: - // none. - // Return: - // none. - - if(!GetHistArray()) return; // Only fill if setup. - if(GetDebug(2)) Info("FillHistograms","fill histograms"); - GetHistogram(iz)->Fill(ix,v); + // Fill the histogram + // Inputs: + // none. + // Outputs: + // none. + // Return: + // none. + + if(!GetHistArray()) return; // Only fill if setup. + if(GetDebug(2)) Info("FillHistograms","fill histograms"); + GetHistogram(iz)->Fill(ix,v); } //______________________________________________________________________ void AliITSsimulationSPD::ResetHistograms(){ - // Reset histograms for this detector - // Inputs: - // none. - // Outputs: - // none. - // Return: - // none. - - if(!GetHistArray()) return; // Only fill if setup. - if(GetDebug(2)) Info("FillHistograms","fill histograms"); - for ( int i=0;iAt(i)) ((TH1F*)fHis->At(i))->Reset(); - } // end for i + // Reset histograms for this detector + // Inputs: + // none. + // Outputs: + // none. + // Return: + // none. + + if(!GetHistArray()) return; // Only fill if setup. + if(GetDebug(2)) Info("FillHistograms","fill histograms"); + for ( int i=0;iAt(i)) ((TH1F*)fHis->At(i))->Reset(); + } // end for i } //______________________________________________________________________ -void AliITSsimulationSPD::SetCoupling(Int_t row, Int_t col, Int_t ntrack, +void AliITSsimulationSPD::SetCoupling(Int_t col, Int_t row, Int_t ntrack, Int_t idhit) { - // Take into account the coupling between adiacent pixels. - // The parameters probcol and probrow are the probability of the - // signal in one pixel shared in the two adjacent pixels along - // the column and row direction, respectively. - // Note pList is goten via GetMap() and module is not need any more. - // Otherwise it is identical to that coded by Tiziano Virgili (BSN). - //Begin_Html - /* - - -
- - . - - 
-    */
-    //End_Html
-    // Inputs:
-    //    Int_t row            z cell index
-    //    Int_t col            x cell index
-    //    Int_t ntrack         track incex number
-    //    Int_t idhit          hit index number
-    // Outputs:
-    //    none.
-    // Return:
-    //     none.
-    Int_t j1,j2,flag=0;
-    Double_t pulse1,pulse2;
-    Double_t couplR=0.0,couplC=0.0;
-    Double_t xr=0.;
-
-    GetCouplings(couplC,couplR);
-    if(GetDebug(3)) Info("SetCoupling","(row=%d,col=%d,ntrack=%d,idhit=%d) "
-                         "Calling SetCoupling couplR=%e couplC=%e",
-                         row,col,ntrack,idhit,couplR,couplC);
-    j1 = row;
-    j2 = col;
-    pulse1 = GetMap()->GetSignalOnly(row,col);
-    pulse2 = pulse1;
-    for (Int_t isign=-1;isign<=1;isign+=2){// loop in row direction
-        do{
-            j1 += isign;
-            //   pulse1 *= couplR; 
-            xr = gRandom->Rndm();
-            //if ((j1<0)||(j1>GetNPixelsZ()-1)||(pulse1GetNPixelsZ()-1) || (xr>couplR)){
-                j1 = row;
-                flag = 1;
-            }else{
-                UpdateMapSignal(col,j1,ntrack,idhit,pulse1);
-                //  flag = 0;
-                flag = 1; // only first next!!
-            } // end if
-        } while(flag == 0);
-        // loop in column direction
-        do{
-            j2 += isign;
-            // pulse2 *= couplC; 
-            xr = gRandom->Rndm();
-            //if((j2<0)||j2>(GetNPixelsX()-1)||pulse2GetNPixelsX()-1) || (xr>couplC)){
-                j2 = col;
-                flag = 1;
-            }else{
-                UpdateMapSignal(j2,row,ntrack,idhit,pulse2);
-                //  flag = 0;
-                flag = 1; // only first next!!
-            } // end if
-        } while(flag == 0);
-    } // for isign
+   //  Take into account the coupling between adiacent pixels.
+   //  The parameters probcol and probrow are the probability of the
+   //  signal in one pixel shared in the two adjacent pixels along
+   //  the column and row direction, respectively.
+   //  Note pList is goten via GetMap() and module is not need any more.
+   //  Otherwise it is identical to that coded by Tiziano Virgili (BSN).
+   //Begin_Html
+   /*
+     
+
+
+ + . + + 
+   */
+   //End_Html
+   // Inputs:
+   //    Int_t col            z cell index
+   //    Int_t row            x cell index
+   //    Int_t ntrack         track incex number
+   //    Int_t idhit          hit index number
+   // Outputs:
+   //    none.
+   // Return:
+   //     none.
+   Int_t j1,j2,flag=0;
+   Double_t pulse1,pulse2;
+   Double_t couplR=0.0,couplC=0.0;
+   Double_t xr=0.;
+
+   GetCouplings(couplC,couplR);
+   if(GetDebug(3)) Info("SetCoupling","(col=%d,row=%d,ntrack=%d,idhit=%d) "
+                        "Calling SetCoupling couplC=%e couplR=%e",
+                        col,row,ntrack,idhit,couplC,couplR);
+   j1 = col;
+   j2 = row;
+   pulse1 = GetMap()->GetSignalOnly(col,row);
+   pulse2 = pulse1;
+   for (Int_t isign=-1;isign<=1;isign+=2){// loop in col direction
+       do{
+           j1 += isign;
+           xr = gRandom->Rndm();
+           if ((j1<0) || (j1>GetNPixelsZ()-1) || (xr>couplC)){
+               j1 = col;
+               flag = 1;
+           }else{
+               UpdateMapSignal(row,j1,ntrack,idhit,pulse1);
+               //  flag = 0;
+               flag = 1; // only first next!!
+           } // end if
+       } while(flag == 0);
+       // loop in row direction
+       do{
+           j2 += isign;
+           xr = gRandom->Rndm();
+           if ((j2<0) || (j2>GetNPixelsX()-1) || (xr>couplR)){
+               j2 = row;
+               flag = 1;
+           }else{
+               UpdateMapSignal(j2,col,ntrack,idhit,pulse2);
+               //  flag = 0;
+               flag = 1; // only first next!!
+           } // end if
+       } while(flag == 0);
+   } // for isign
 }
 //______________________________________________________________________
-void AliITSsimulationSPD::SetCouplingOld(Int_t row, Int_t col,
-                Int_t ntrack,Int_t idhit) {
-    //  Take into account the coupling between adiacent pixels.
-    //  The parameters probcol and probrow are the fractions of the
-    //  signal in one pixel shared in the two adjacent pixels along
-    //  the column and row direction, respectively.
-    //Begin_Html
-    /*
-      
-
-
- - . - - 
-    */
-    //End_Html
-    // Inputs:
-    //    Int_t row            z cell index
-    //    Int_t col            x cell index
-    //    Int_t ntrack         track incex number
-    //    Int_t idhit          hit index number
-    //    Int_t module         module number
-    // Outputs:
-    //    none.
-    // Return:
-    //     none.
-    Int_t j1,j2,flag=0;
-    Double_t pulse1,pulse2;
-    Double_t couplR=0.0,couplC=0.0;
-
-    GetCouplings(couplC,couplR);
-
-    //  Debugging ...
+void AliITSsimulationSPD::SetCouplingOld(Int_t col, Int_t row,
+               Int_t ntrack,Int_t idhit) {
+   //  Take into account the coupling between adiacent pixels.
+   //  The parameters probcol and probrow are the fractions of the
+   //  signal in one pixel shared in the two adjacent pixels along
+   //  the column and row direction, respectively.
+   //Begin_Html
+   /*
+     
+
+
+ + . + + 
+   */
+   //End_Html
+   // Inputs:
+   //    Int_t col            z cell index
+   //    Int_t row            x cell index
+   //    Int_t ntrack         track incex number
+   //    Int_t idhit          hit index number
+   //    Int_t module         module number
+   // Outputs:
+   //    none.
+   // Return:
+   //     none.
+   Int_t j1,j2,flag=0;
+   Double_t pulse1,pulse2;
+   Double_t couplR=0.0,couplC=0.0;
+
+   GetCouplings(couplC,couplR);
+
+   //  Debugging ...
 //    cout << "Threshold --> " << GetThreshold() << endl;  // dom
-//    cout << "Couplings --> " << couplC << " " << couplR << endl;  //dom
-
-
-    if(GetDebug(3)) Info("SetCouplingOld","(row=%d,col=%d,ntrack=%d,idhit=%d) "
-                         "Calling SetCoupling couplR=%e couplC=%e",
-                         row,col,ntrack,idhit,couplR,couplC);
-    for (Int_t isign=-1;isign<=1;isign+=2){// loop in row direction
-    pulse1 = GetMap()->GetSignalOnly(row,col);
-    pulse2 = pulse1;
-    j1 = row;
-    j2 = col;
-        do{
-            j1 += isign;
-            pulse1 *= couplR;
-            if ((j1<0)||(j1>GetNPixelsZ()-1)||(pulse1GetSignalOnly(row,col);
-                j1 = row;
-                flag = 1;
-            }else{
-                UpdateMapSignal(col,j1,ntrack,idhit,pulse1);
-                // flag = 0;
-                flag = 1;  // only first next !!
-            } // end if
-        } while(flag == 0);
-        // loop in column direction
-        do{
-            j2 += isign;
-            pulse2 *= couplC;
-            if((j2<0)||(j2>(GetNPixelsX()-1))||(pulse2GetSignalOnly(row,col);
-                j2 = col;
-                flag = 1;
-            }else{
-                UpdateMapSignal(j2,row,ntrack,idhit,pulse2);
-                // flag = 0;
-                flag = 1; // only first next!!
-            } // end if
-        } while(flag == 0);
-    } // for isign
+//    cout << "Couplings --> " << couplC << " " << couplR << endl;  // dom
+
+   if(GetDebug(3)) Info("SetCouplingOld","(col=%d,row=%d,ntrack=%d,idhit=%d) "
+                        "Calling SetCoupling couplC=%e couplR=%e",
+                        col,row,ntrack,idhit,couplC,couplR);
+   for (Int_t isign=-1;isign<=1;isign+=2){// loop in col direction
+   pulse1 = GetMap()->GetSignalOnly(col,row);
+   pulse2 = pulse1;
+   j1 = col;
+   j2 = row;
+       do{
+           j1 += isign;
+           pulse1 *= couplC;
+           if ((j1<0)||(j1>GetNPixelsZ()-1)||(pulse1GetSignalOnly(col,row);
+               j1 = col;
+               flag = 1;
+           }else{
+               UpdateMapSignal(row,j1,ntrack,idhit,pulse1);
+               // flag = 0;
+               flag = 1;  // only first next !!
+           } // end if
+       } while(flag == 0);
+       // loop in row direction
+       do{
+           j2 += isign;
+           pulse2 *= couplR;
+           if((j2<0)||(j2>(GetNPixelsX()-1))||(pulse2GetSignalOnly(col,row);
+               j2 = row;
+               flag = 1;
+           }else{
+               UpdateMapSignal(j2,col,ntrack,idhit,pulse2);
+               // flag = 0;
+               flag = 1; // only first next!!
+           } // end if
+       } while(flag == 0);
+   } // for isign
 }
+//______________________________________________________________________
+void AliITSsimulationSPD::GenerateStrobePhase()
+{
+ // Generate randomly the strobe
+ // phase w.r.t to the LHC clock
+ // Done once per event
+   const Double_t kBunchLenght = 25e-9; // LHC clock
+   fStrobePhase = ((Double_t)gRandom->Integer(fStrobeLenght))*kBunchLenght-
+                  (Double_t)fStrobeLenght*kBunchLenght+
+                  kBunchLenght/2;
+}
+