fix in calling of gaussian spread function

[u/mrichter/AliRoot.git] / ITS / AliITS.cxx

diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx
index 78407b11d71aadb600fedcd97a9113b834381a23..d62eebdcaef61f7fe0071c8c354c20d13bff004b 100644 (file)
--- a/ITS/AliITS.cxx
+++ b/ITS/AliITS.cxx
@@ -126,7 +126,7 @@ fpSDigits(0)
   
 //    SetDetectors(); // default to fOpt="All". This variable not written out.
 //PH    SetMarkerColor(kRed);
-  for (int i=fgkNTYPES;i--;) fRawID2ClusID[i] = 0;
+  for (int i=fgkNTYPES;i--;) fkRawID2ClusID[i] = 0;
 }
 //______________________________________________________________________
 AliITS::AliITS(const Char_t *title):
@@ -167,7 +167,7 @@ AliITS::AliITS(const Char_t *title):
     //PH  SetMarkerColor(kRed);
     if(!fLoader) MakeLoader(AliConfig::GetDefaultEventFolderName());
     fDetTypeSim->SetLoader((AliITSLoader*)fLoader);
-    for (int i=fgkNTYPES;i--;) fRawID2ClusID[i] = 0;
+    for (int i=fgkNTYPES;i--;) fkRawID2ClusID[i] = 0;
 }
 //______________________________________________________________________
 AliITS::AliITS(const char *name, const char *title):
@@ -204,7 +204,7 @@ AliITS::AliITS(const char *name, const char *title):
   //PH  SetMarkerColor(kRed);
   if(!fLoader) MakeLoader(AliConfig::GetDefaultEventFolderName());
   fDetTypeSim->SetLoader((AliITSLoader*)fLoader);
-  for (int i=fgkNTYPES;i--;) fRawID2ClusID[i] = 0;
+  for (int i=fgkNTYPES;i--;) fkRawID2ClusID[i] = 0;
 }
 //______________________________________________________________________
 AliITS::~AliITS(){
@@ -257,18 +257,18 @@ AliITS::~AliITS(){
 }
 
 //______________________________________________________________________
-AliDigitizer* AliITS::CreateDigitizer(AliRunDigitizer* manager)const{
+AliDigitizer* AliITS::CreateDigitizer(AliDigitizationInput* digInput)const{
     // Creates the AliITSDigitizer in a standard way for use via AliModule.
     // This function can not be included in the .h file because of problems
     // with the order of inclusion (recursive).
     // Inputs:
-    //    AliRunDigitizer *manager  The Manger class for Digitization
+    //    AliDigitizationInput* digInput  The Manger class for Digitization
     // Output:
     //    none.
     // Return:
     //    A new AliITSRunDigitizer (cast as a AliDigitizer).
 
-     return new AliITSDigitizer(manager);
+     return new AliITSDigitizer(digInput);
 }
 //______________________________________________________________________
 void AliITS::Init(){
@@ -1251,7 +1251,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
   Double_t thr, sigma; 
 
   Int_t countRW = -1; // RS counter for raw -> cluster ID's (used in embedding)
-  const TArrayI* rawID2clusID = fRawID2ClusID[kSPD];
+  const TArrayI* rawID2clusID = fkRawID2ClusID[kSPD];
   AliITSRawStreamSPD inputSPD(rawReader);
   while(1){
     Bool_t next  = inputSPD.Next();
@@ -1269,7 +1269,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
     TClonesArray& dum = *fModA[module];
     fDetTypeSim->GetSimuParam()->SPDThresholds(module,thr,sigma);
     thr += 1.;
-    int label = -1;
+    int label = kMaxLabel;
     if (rawID2clusID) { // RS If the raw->cluster ID is set (filled by cluster finder) store cluster ID's in SDigits
       if (rawID2clusID->GetSize()<=countRW) {AliError(Form("The buffer of rawSPD to clusSPD ID's is shorter than current rawSPD ID=%d",countRW));}
       else label = (*rawID2clusID)[countRW];
@@ -1288,7 +1288,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
   Int_t firstSSD=AliITSgeomTGeo::GetModuleIndex(5,1,1);
   //
   countRW = -1; // RS
-  rawID2clusID = fRawID2ClusID[kSDD];
+  rawID2clusID = fkRawID2ClusID[kSDD];
   AliITSRawStream* inputSDD=AliITSRawStreamSDD::CreateRawStreamSDD(rawReader);
   for(Int_t iMod=firstSDD; iMod<firstSSD; iMod++){
     AliITSCalibrationSDD* cal = (AliITSCalibrationSDD*)fDetTypeSim->GetCalibrationModel(iMod);
@@ -1316,7 +1316,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
       if (module >= size) continue;
       last = fModA[module]->GetEntries();
       TClonesArray& dum = *fModA[module];
-      int label = -1;
+      int label = kMaxLabel;
       if (rawID2clusID) { // RS If the raw->cluster ID is set (filled by cluster finder) store cluster ID's in SDigits
        if (rawID2clusID->GetSize()<=countRW) {AliError(Form("The buffer of rawSDD to clusSDD ID's is shorter than current rawSDD ID=%d",countRW));}
        else label = (*rawID2clusID)[countRW];
@@ -1335,7 +1335,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
   npx = segSSD->Npx();
   AliITSRawStreamSSD inputSSD(rawReader);
   countRW = -1;
-  rawID2clusID = fRawID2ClusID[kSSD];
+  rawID2clusID = fkRawID2ClusID[kSSD];
   while(1){
     Bool_t next  = inputSSD.Next();
     if (!next) break;
@@ -1352,7 +1352,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
        
     last = fModA[module]->GetEntries();
     TClonesArray& dum = *fModA[module];
-    int label = -1;
+    int label = kMaxLabel;
     if (rawID2clusID) { // RS If the raw->cluster ID is set (filled by cluster finder) store cluster ID's in SDigits
       if (rawID2clusID->GetSize()<=countRW) {AliError(Form("The buffer of rawSSD to clusSSD ID's is shorter than current rawSSD ID=%d",countRW));}
       else label = (*rawID2clusID)[countRW];
@@ -1398,9 +1398,8 @@ void AliITS::UpdateInternalGeometry(){
 //   AliDebug(1,"Delete ITSgeom and create a new one reading TGeo");
 
   AliITSVersion_t version = (AliITSVersion_t)IsVersion();
-  Int_t minor = 0;
   AliITSInitGeometry initgeom;
-  AliITSgeom* geom = initgeom.CreateAliITSgeom(version,minor);
+  AliITSgeom* geom = initgeom.CreateAliITSgeom(version);
   SetITSgeom(geom);
 }
 //______________________________________________________________________
@@ -1416,3 +1415,5 @@ void AliITS::WriteFOSignals(){
   fDetTypeSim->ProcessNoiseForFastOr();
   fDetTypeSim->WriteFOSignals();
 }
+
+