Run number initialized to -1.

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

diff --git a/ITS/AliITSPreprocessorSDD.cxx b/ITS/AliITSPreprocessorSDD.cxx
index 6aeb7bde80a376a448f5e425638863224db072b0..8cdefee4258223f53286eff276d1cb5631b44d79 100644 (file)
--- a/ITS/AliITSPreprocessorSDD.cxx
+++ b/ITS/AliITSPreprocessorSDD.cxx
@@ -18,7 +18,6 @@
 
 const Int_t AliITSPreprocessorSDD::fgkNumberOfSDD = 260;
 const Int_t AliITSPreprocessorSDD::fgkNumberOfChannels = 512;
-const Int_t AliITSPreprocessorSDD::fgkNumberOfChannelsPerChip = 64;
 const TString AliITSPreprocessorSDD::fgkNameHistoPedestals = "hpedestal";
 const TString AliITSPreprocessorSDD::fgkNameHistoNoise = "hnoise";
 ClassImp(AliITSPreprocessorSDD)
@@ -30,7 +29,7 @@ UInt_t AliITSPreprocessorSDD::Process(TMap*/* dcsAliasMap*/){
 
   TObjArray respSDD(fgkNumberOfSDD);
   respSDD.SetOwner(kFALSE);
-  Float_t baseline,rawnoise,cmn,gain;
+  Float_t baseline,rawnoise,cmn,corn,gain;
   Int_t isgoodan,i,im,is,isgoodmod;
   Int_t numOfBadChannels[fgkNumberOfSDD];
   //TString pwd = gSystem->pwd();
@@ -48,6 +47,10 @@ UInt_t AliITSPreprocessorSDD::Process(TMap*/* dcsAliasMap*/){
     TObjString* tarId = (TObjString*) sourceList->At(ind);
     TString tarName = GetFile(kDAQ, "SDD_Calib", tarId->GetString().Data());
 //    gSystem->cd(tempDir);
+    if(tarName.Length()==0){
+      Log(Form("Baseline tar file from source %d not found.",ind));
+      return 2;
+    }
     sprintf(command,"tar -xf %s",tarName.Data());
     gSystem->Exec(command);
     ind++;
@@ -62,8 +65,12 @@ UInt_t AliITSPreprocessorSDD::Process(TMap*/* dcsAliasMap*/){
   ind = 0;
   while (sourceList->At(ind)!=NULL) {
    TObjString* tarId = (TObjString*) sourceList->At(ind);
-     TString tarName = GetFile(kDAQ, "SDD_Injec", tarId->GetString().Data());
+   TString tarName = GetFile(kDAQ, "SDD_Injec", tarId->GetString().Data());
 //    gSystem->cd(tempDir);
+    if(tarName.Length()==0){
+      Log(Form("Injector tar file from source %d not found.",ind));
+      return 2;
+    }
     sprintf(command,"tar -xf %s",tarName.Data());
     gSystem->Exec(command);
     ind++;
@@ -87,7 +94,7 @@ UInt_t AliITSPreprocessorSDD::Process(TMap*/* dcsAliasMap*/){
       fscanf(basFil,"%d %d %d\n",&im,&is,&isgoodmod);
       if(!isgoodmod) cal->SetDead();
       for(Int_t ian=0;ian<(fgkNumberOfChannels/2);ian++){
-       fscanf(basFil,"%d %d %f %f %f %f\n",&i,&isgoodan,&baseline,&rawnoise,&cmn,&gain);
+       fscanf(basFil,"%d %d %f %f %f %f %f\n",&i,&isgoodan,&baseline,&rawnoise,&cmn,&corn,&gain);
        Int_t ich=ian;
        if(isid==1) ich+=256;
        if(!isgoodan){ 
@@ -97,8 +104,8 @@ UInt_t AliITSPreprocessorSDD::Process(TMap*/* dcsAliasMap*/){
        }
        cal->SetBaseline(ich,baseline);
        cal->SetNoiseAfterElectronics(ich,rawnoise);
-       Int_t iChip=ian/fgkNumberOfChannelsPerChip;
-       Int_t iChInChip=ian%fgkNumberOfChannelsPerChip;
+       Int_t iChip=cal->GetChip(ich);
+       Int_t iChInChip=cal->GetChipChannel(ich);
        cal->SetGain(gain,isid,iChip,iChInChip);
       }
       cal->SetDeadChannels(numOfBadChannels[imod]);
@@ -118,7 +125,7 @@ UInt_t AliITSPreprocessorSDD::Process(TMap*/* dcsAliasMap*/){
        return 2;
       }      
       while (!feof(injFil)){
-       fscanf(injFil,"%d %d %",&evNumb,&timeStamp);
+       fscanf(injFil,"%d %d",&evNumb,&timeStamp);
        if(feof(injFil)) break;
        for(Int_t ic=0;ic<4;ic++) fscanf(injFil,"%f",&param[ic]);
        cal->SetDriftSpeedParam(isid,param);