Adding the global event information in central place

[u/mrichter/AliRoot.git] / TPC / AliTPCcalibTracks.cxx

diff --git a/TPC/AliTPCcalibTracks.cxx b/TPC/AliTPCcalibTracks.cxx
index bad63dcec7faab231b06c54de196b3184e486761..86755828a6d0042e3c3e216ffb97ad98d75e6604 100644 (file)
--- a/TPC/AliTPCcalibTracks.cxx
+++ b/TPC/AliTPCcalibTracks.cxx
@@ -928,6 +928,11 @@ void  AliTPCcalibTracks::FillResolutionHistoLocal(AliTPCseed * track){
        Float_t sy = cluster0->GetSigmaY2();
        Float_t sz = cluster0->GetSigmaZ2();
        (*cstream)<<"Resol0"<<
+         "run="<<fRun<<              //  run number
+         "event="<<fEvent<<          //  event number
+         "time="<<fTime<<            //  time stamp of event
+         "trigger="<<fTrigger<<      //  trigger
+         "mag="<<fMagF<<             //  magnetic field              
          "padSize="<<padSize<<
          "angley="<<angley<<
          "anglez="<<anglez<<
@@ -1169,6 +1174,11 @@ void AliTPCcalibTracks::FillResolutionHistoLocalDebugPart(AliTPCseed *track, Ali
    TTreeSRedirector *cstream = GetDebugStreamer();
    if (cstream){
      (*cstream)<<"ResolCl"<<   // valgrind 3   40,000 bytes in 1 blocks are possibly 
+       "run="<<fRun<<              //  run number
+       "event="<<fEvent<<          //  event number
+       "time="<<fTime<<            //  time stamp of event
+       "trigger="<<fTrigger<<      //  trigger
+       "mag="<<fMagF<<             //  magnetic field        
        "Sector="<<sector<<
        "Cl.="<<cluster0<<
        "CSigmaY0="<<csigmaY0<<   // cluster errorY
@@ -1201,6 +1211,11 @@ void AliTPCcalibTracks::FillResolutionHistoLocalDebugPart(AliTPCseed *track, Ali
      
      //       tracklet dubug
      (*cstream)<<"ResolTr"<<   
+       "run="<<fRun<<              //  run number
+       "event="<<fEvent<<          //  event number
+       "time="<<fTime<<            //  time stamp of event
+       "trigger="<<fTrigger<<      //  trigger
+       "mag="<<fMagF<<             //  magnetic field        
        "padSize="<<padSize<<
        "IPad="<<padSize<<
        "Sector="<<sector<<
@@ -2573,9 +2588,6 @@ void  AliTPCcalibTracks::MakeQPosNormAll(TTree * chainres, AliTPCClusterParam *
   chainres->SetAlias("st","(sin(dt)-dt)");
   //
   chainres->SetAlias("di","sqrt(1.-abs(Cl.fZ/250.))");
-  chainres->SetAlias("dq","sqrt(15./(5+Cl.fMax))");
-  chainres->SetAlias("sy","(0.32/sqrt(0.01^2+Cl.fSigmaY2))");
-  chainres->SetAlias("sz","(0.32/sqrt(0.01^2+Cl.fSigmaZ2))");
   //
   //
   //
@@ -2584,25 +2596,13 @@ void  AliTPCcalibTracks::MakeQPosNormAll(TTree * chainres, AliTPCClusterParam *
   //
   fstringY+="(dp)++";            //1
   fstringY+="(dp)*di++";         //2
-  fstringY+="(dp)*dq++";         //3
-  fstringY+="(dp)*sy++";         //4
-  //
-  fstringY+="(sp)++";            //5
-  fstringY+="(sp)*di++";         //6
-  fstringY+="(sp)*dq++";         //7
-  fstringY+="(sp)*sy++";         //8
-  //
-
+  fstringY+="(sp)++";            //3
+  fstringY+="(sp)*di++";         //4
   TString fstringZ="";  
   fstringZ+="(dt)++";            //1
   fstringZ+="(dt)*di++";         //2
-  fstringZ+="(dt)*dq++";         //3
-  fstringZ+="(dt)*sz++";         //4
-  //
-  fstringZ+="(st)++";            //5
-  fstringZ+="(st)*di++";         //6
-  fstringZ+="(st)*dq++";         //7
-  fstringZ+="(st)*sz++";         //8
+  fstringZ+="(st)++";            //3
+  fstringZ+="(st)*di++";         //4
   //
   // Z corrections
   //
@@ -2638,82 +2638,5 @@ void  AliTPCcalibTracks::MakeQPosNormAll(TTree * chainres, AliTPCClusterParam *
   //  chainres->Draw("Cl.fZ-PZ0.fElements[0]","CSigmaY0<0.7&&CSigmaZ0<0.7"+cutA,"",10000);   
 }
 
-/*
-  gSystem->Load("libSTAT.so");
-  gSystem->AddIncludePath("-I$ALICE_ROOT/TPC/macros");
-  gROOT->LoadMacro("$ALICE_ROOT/TPC/macros/AliXRDPROOFtoolkit.cxx+")
-  AliXRDPROOFtoolkit tool;  
-  TChain * chainres = tool.MakeChain("tracks.txt","ResolCl",0,10200);
-  chainres->Lookup();
-  //
-  //
-  //
-
-
-
-  TStatToolkit toolkit;
-  Double_t chi2;
-  TVectorD fitParamY0;
-  TVectorD fitParamY1;
-  TVectorD fitParamZ0;
-  TVectorD fitParamZ1;
-  TMatrixD covMatrix;
-  Int_t npoints;
-
-  chainres->SetAlias("dp","(-1+(Cl.fZ>0)*2)*((Cl.fPad-int(Cl.fPad))-0.5)");
-  chainres->SetAlias("dt","(-1+(Cl.fZ>0)*2)*((Cl.fTimeBin-0.66-int(Cl.fTimeBin-0.66))-0.5)");
-  chainres->SetAlias("sp","(sin(dp*pi)-dp*pi)");
-  chainres->SetAlias("st","(sin(dt)-dt)");
-  //
-  chainres->SetAlias("di","sqrt(1.-abs(Cl.fZ/250.))");
-  chainres->SetAlias("dq","sqrt(15./(5+Cl.fMax))");
-  chainres->SetAlias("sy","(0.32/sqrt(0.01^2+Cl.fSigmaY2))");
-  chainres->SetAlias("sz","(0.32/sqrt(0.01^2+Cl.fSigmaZ2))");
-  //
-  //
-  //
-  TCut cutA("1")
-  
-  TString fstringY="";  
-  //
-  fstringY+="(dp)++";            //1
-  fstringY+="(dp)*di++";         //2
-  fstringY+="(dp)*dq++";         //3
-  fstringY+="(dp)*sy++";         //4
-  //
-  fstringY+="(sp)++";            //5
-  fstringY+="(sp)*di++";         //6
-  fstringY+="(sp)*dq++";         //7
-  fstringY+="(sp)*sy++";         //8
-  //
-
-  TString fstringZ="";  
-  fstringZ+="(dt)++";            //1
-  fstringZ+="(dt)*di++";         //2
-  fstringZ+="(dt)*dq++";         //3
-  fstringZ+="(dt)*sz++";         //4
-  //
-  fstringZ+="(st)++";            //5
-  fstringZ+="(st)*di++";         //6
-  fstringZ+="(st)*dq++";         //7
-  fstringZ+="(st)*sz++";         //8
-
-  
-  TString *strZ0 = toolkit.FitPlane(chainres,"(Cl.fZ-PZ0.fElements[0]):CSigmaZ0",fstringZ.Data(), "Cl.fDetector<36"+cutA, chi2,npoints,fitParamZ0,covMatrix,-1,0,100000);
-  TString *strZ1 = toolkit.FitPlane(chainres,"(Cl.fZ-PZ0.fElements[0]):CSigmaZ0",fstringZ.Data(), "Cl.fDetector>36"+cutA, chi2,npoints,fitParamZ1,covMatrix,-1,0,100000);
-
-  TString *strY0 = toolkit.FitPlane(chainres,"(Cl.fY-PY0.fElements[0]):CSigmaY0",fstringY.Data(), "Cl.fDetector<36"+cutA, chi2,npoints,fitParamY0,covMatrix,-1,0,100000);
-  TString *strY1 = toolkit.FitPlane(chainres,"(Cl.fY-PY0.fElements[0]):CSigmaY0",fstringY.Data(), "Cl.fDetector>36"+cutA, chi2,npoints,fitParamY1,covMatrix,-1,0,100000);
-
-  chainres->SetAlias("fitZ0",strZ0.Data());
-  chainres->SetAlias("fitZ1",strZ1.Data());
-  chainres->SetAlias("fitY0",strY0.Data());
-  chainres->SetAlias("fitY1",strY1.Data());
-  chainres->Draw("Cl.fZ-PZ0.fElements[0]","CSigmaY0<0.7&&CSigmaZ0<0.7"+cutA,"",10000)
-
-
-
-*/
-