X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCPreprocessorOffline.cxx;h=c79ab8017ed5a4b07398877d77ad254bea79a1a5;hb=bc8264387693a9e1f97d45233ffc8cd6d52f606a;hp=5197e36781a91c5af20ba26253b014e8488b930b;hpb=2a3fb9f627135fbcb2b8420e4729f3e8f6ff7312;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCPreprocessorOffline.cxx b/TPC/AliTPCPreprocessorOffline.cxx
index 5197e36781a..c79ab8017ed 100644
--- a/TPC/AliTPCPreprocessorOffline.cxx
+++ b/TPC/AliTPCPreprocessorOffline.cxx
@@ -261,7 +261,11 @@ Bool_t AliTPCPreprocessorOffline::ValidateTimeGain()
   Float_t maxGain = fMaxGain;
 
   TGraphErrors *gr = (TGraphErrors*)fGainArray->FindObject("TGRAPHERRORS_MEAN_GAIN_BEAM_ALL");
-  if(!gr) return kFALSE;
+  if (!gr) {
+    gr = (TGraphErrors*)fGainArray->FindObject("TGRAPHERRORS_MEAN_GAIN_COSMIC_ALL");
+    if (!gr) return kFALSE;
+    Printf("Assuming given run is a cosmic run. Using gain calibration from Fermi-plateau muons.");
+  }
   if(gr->GetN()<1) return kFALSE;
 
   // check whether gain in the range
@@ -490,9 +494,9 @@ void AliTPCPreprocessorOffline::AddAlignmentGraphs(  TObjArray * vdriftArray, Al
   arrayTRD=timeDrift->GetAlignTRDTPC();
   arrayTOF=timeDrift->GetAlignTOFTPC();
 
-  if (arrayITS->GetEntries()>0) mstatITS= AliTPCcalibDButil::MakeStatRelKalman(arrayITS,0.9,50,fMaxVdriftCorr);
-  if (arrayTOF->GetEntries()>0) mstatTOF= AliTPCcalibDButil::MakeStatRelKalman(arrayTOF,0.9,1000,fMaxVdriftCorr);
-  if (arrayTRD->GetEntries()>0) mstatTRD= AliTPCcalibDButil::MakeStatRelKalman(arrayTRD,0.9,50,fMaxVdriftCorr);
+  if (arrayITS->GetEntries()>0) mstatITS= AliTPCcalibDButil::MakeStatRelKalman(arrayITS,0.7,50,fMaxVdriftCorr);
+  if (arrayTOF->GetEntries()>0) mstatTOF= AliTPCcalibDButil::MakeStatRelKalman(arrayTOF,0.7,1000,fMaxVdriftCorr);
+  if (arrayTRD->GetEntries()>0) mstatTRD= AliTPCcalibDButil::MakeStatRelKalman(arrayTRD,0.7,50,fMaxVdriftCorr);
   //
   TObjArray * arrayITSP= AliTPCcalibDButil::SmoothRelKalman(arrayITS,*mstatITS, 0, 5.);
   TObjArray * arrayITSM= AliTPCcalibDButil::SmoothRelKalman(arrayITS,*mstatITS, 1, 5.);
@@ -1280,7 +1284,13 @@ void AliTPCPreprocessorOffline::MakeChainTime(){
   //const char *cptype[5]={"dy","dz","dsnp","dtheta","d1pt"}; 
   const char * hname[5]={"dy","dz","dsnp","dtheta","d1pt"};
   Int_t run=0;
-  AliTPCcalibTime  *calibTime= (AliTPCcalibTime*) f.Get("calibTime");
+  AliTPCcalibTime  *calibTime = 0;
+  TObjArray * array = (TObjArray*)f.Get("TPCCalib");
+  if (array){
+    calibTime = (AliTPCcalibTime *)array->FindObject("calibTime");
+  } else {
+    calibTime = (AliTPCcalibTime*)f.Get("calibTime");
+  }
   if (!calibTime) return;
   TTreeSRedirector *pcstream = new TTreeSRedirector("meanITSVertex.root");
   //