Fast generator for prompt photons (Serguei Kiselev)

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

diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx
index 3bdf481a677b067fb85cc2ab6b03acec727df91b..72636bd63b4d562af0af9ce9c05ecdbfd663ce56 100644 (file)
--- a/ITS/AliITS.cxx
+++ b/ITS/AliITS.cxx
@@ -91,7 +91,6 @@ the AliITS class.
 #include "AliITSRawStreamSPD.h"
 #include "AliITSRawStreamSSD.h"
 #include "AliITSRawStreamSDD.h"
-#include "AliITSresponseSDD.h" 
 #include "AliRawReader.h"
 #include "AliRun.h"
 #include "AliLog.h"
@@ -371,7 +370,7 @@ void AliITS:: MakeBranchInTreeD(TTree* treeD, const char* file){
   fDetTypeSim->SetLoader((AliITSLoader*)fLoader);
 
   const Char_t *det[3] = {"SPD","SDD","SSD"};
-  Char_t* digclass;
+  const Char_t* digclass;
   Int_t buffersize = 4000;
   Char_t branchname[30];
   
@@ -1078,8 +1077,10 @@ void AliITS::Digits2Raw(){
   }
   fDetTypeSim->SetTreeAddressD(digits,(Char_t*)GetName());
   AliITSDDLModuleMapSDD* ddlsdd=fDetTypeSim->GetDDLModuleMapSDD();
-
+  Bool_t isHLTmodeC=fDetTypeSim->IsHLTmodeC();
   AliITSDDLRawData rawWriter;
+  if(isHLTmodeC) rawWriter.SetUseCompressedSDDFormat(kTRUE);
+  else rawWriter.SetUseCompressedSDDFormat(kFALSE);
   //Verbose level
   // 0: Silent
   // 1: cout messages
@@ -1127,7 +1128,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
     TClonesArray** modA = new TClonesArray*[size];
     for (Int_t mod = 0; mod < size; mod++) modA[mod] = new TClonesArray("AliITSpListItem", 10000);
     
-    AliLoader* loader =  (gAlice->GetRunLoader())->GetLoader("ITSLoader");
+    AliLoader* loader =  (AliRunLoader::Instance())->GetLoader("ITSLoader");
     if (!loader)
     {
        Error("Open","Can not get ITS loader from Run Loader");
@@ -1174,7 +1175,7 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
  
        last = (modA[module])->GetEntries();
        TClonesArray& dum = *modA[module];
-       fDetTypeSim->GetCalibrationModel(module)->Thresholds(thr,sigma);
+       fDetTypeSim->GetSimuParam()->SPDThresholds(module,thr,sigma);
        thr += 1.;
        new (dum[last]) AliITSpListItem(-1, -1, module, index, thr);
     }
@@ -1199,11 +1200,6 @@ Bool_t AliITS::Raw2SDigits(AliRawReader* rawReader)
        Int_t index  = npx * anode + time;
 
        if (module >= size) continue;
-       /* 8->10 bit expansion is done in AliITSRawStreamSDD
-       // 8bit -> 10 bit
-       AliITSresponseSDD *resSDD = (AliITSresponseSDD*) fDetTypeSim->GetResponse(1);
-       Int_t signal10 = resSDD->Convert8to10(signal);  // signal is a 8 bit value (if the compression is active)
-       */
        last = modA[module]->GetEntries();
        TClonesArray& dum = *modA[module];
        new (dum[last]) AliITSpListItem(-1, -1, module, index, Double_t(signal10));