- Fix of warnings which are not seen with the standard MakeFile

- AltroEmulator: change of standard location for temporary (date) files

diff --git a/TPC/AliTPCAltroEmulator.cxx b/TPC/AliTPCAltroEmulator.cxx
index 0b65e52ae00177c0fd96dcec66b545bc788cf884..7bcadc77ff5750d100559f14b5cf7fce9aacaef6 100644 (file)
--- a/TPC/AliTPCAltroEmulator.cxx
+++ b/TPC/AliTPCAltroEmulator.cxx
@@ -107,9 +107,9 @@ AliTPCAltroEmulator::AliTPCAltroEmulator(Int_t timebins, short* Channel) :
   fReader(0),           // for Altro Emulation on Raw Reader
   fDecoder(0),
   fRunNumber(0), 
-  fDDLFolderName("/tmp/"),
-  fOutputDateFileName("/tmp/tmp.date"),
-  fOutputRootFileName("/tmp/tmp.root"),
+  fDDLFolderName("./"),
+  fOutputDateFileName("./tmpRaw.date"),
+  fOutputRootFileName("./tmpRaw.root"),
   fIsRandom(kTRUE),
   fChannels(0),
   fCDHs(0),

diff --git a/TPC/AliTPCCorrection.cxx b/TPC/AliTPCCorrection.cxx
index 0b809f791d7b5c99d45400ffb33ae446d45cbec2..9ac347461c0bfc7ab6c23a9dcc82f754af412092 100644 (file)
--- a/TPC/AliTPCCorrection.cxx
+++ b/TPC/AliTPCCorrection.cxx
@@ -1877,7 +1877,7 @@ void AliTPCCorrection::FastSimDistortedVertex(Double_t orgVertex[3], Int_t nTrac
   AliMagF* magF= (AliMagF*)TGeoGlobalMagField::Instance()->GetField();
   if (!magF) AliError("Magneticd field - not initialized");
   Double_t bz = magF->SolenoidField(); //field in kGauss
-  printf("bz: %lf\n",bz);
+  printf("bz: %f\n",bz);
   AliVertexerTracks *vertexer = new AliVertexerTracks(bz); // bz in kGauss
 
   TObjArray   aTrk;              // Original Track array of Aside

diff --git a/TPC/AliTPCCorrection.h b/TPC/AliTPCCorrection.h
index a11422fa448ffa99fc559928a9083b4e33af640b..e4b568ff5f6dbda345eb1c48b79bb33976a657f1 100644 (file)
--- a/TPC/AliTPCCorrection.h
+++ b/TPC/AliTPCCorrection.h
@@ -4,56 +4,6 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-// _________________________________________________________________
-//
-// Begin_Html
-//   <h2>  AliTPCCorrection class   </h2>    
-//                                                                          
-//   This class provides a general framework to deal with space point         
-//   distortions. An correction class which inherits from here is for example 
-//   AliTPCExBBShape or AliTPCExBTwist                                        
-//   <p>                                                                        
-//   General functions are (for example):  <br>                                    
-//   CorrectPoint(x,roc) where x is the vector of inital positions in        
-//   cartesian coordinates and roc represents the Read Out chamber number    
-//   according to the offline naming convention. The vector x is overwritten 
-//   with the corrected coordinates.                                         
-//   <p>                                                                        
-//   An alternative usage would be CorrectPoint(x,roc,dx), which leaves the    
-//   vector x untouched, put returns the distortions via the vector dx      
-//   <p>
-//   Several plot functionalities (see example below), general solvers as well as simplified interpolation techniques are implemented.
-//   <p>                                                                       
-//   The class allows "effective Omega Tau" corrections to be shifted to the 
-//   single distortion classes.                                              
-//   <p>                                                                      
-//   Note: This class is normally used via the class AliTPCComposedCorrection
-// End_Html
-//
-// Begin_Macro(source) 
-//   {
-//   gROOT->SetStyle("Plain"); gStyle->SetPalette(1);
-//   TCanvas *c2 = new TCanvas("c2","c2",800,1200);  c2->Divide(2,3);
-//   AliTPCROCVoltError3D roc; // EXAMPLE PLOTS - SEE BELOW
-//   roc.SetOmegaTauT1T2(0,1,1); // B=0
-//   Float_t z0 = 1; // at +1 cm -> A side
-//   c2->cd(1); roc.CreateHistoDRinXY(1.,300,300)->Draw("cont4z"); 
-//   c2->cd(3);roc.CreateHistoDRPhiinXY(1.,300,300)->Draw("cont4z"); 
-//   c2->cd(5);roc.CreateHistoDZinXY(1.,300,300)->Draw("cont4z"); 
-//   Float_t phi0=0.5;
-//   c2->cd(2);roc.CreateHistoDRinZR(phi0)->Draw("surf2"); 
-//   c2->cd(4);roc.CreateHistoDRPhiinZR(phi0)->Draw("surf2"); 
-//   c2->cd(6);roc.CreateHistoDZinZR(phi0)->Draw("surf2"); 
-//   return c2;
-//   } 
-// End_Macro
-//
-// Begin_Html
-//   <p>
-//   Date: 27/04/2010  <br>
-//   Authors: Magnus Mager, Stefan Rossegger, Jim Thomas                     
-// End_Html 
-// _________________________________________________________________
 
 ////////////////////////////////////////////////////////////////////////////////
 // AliTPCCorrection class                                                     //

diff --git a/TPC/AliTPCSpaceCharge3D.cxx b/TPC/AliTPCSpaceCharge3D.cxx
index b4b7183653769b73f1b15be80a7541e53eae217d..1b8eacd0cdff91847e3f4c6ff4741ec4389e0344 100644 (file)
--- a/TPC/AliTPCSpaceCharge3D.cxx
+++ b/TPC/AliTPCSpaceCharge3D.cxx
@@ -283,12 +283,12 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortion() {
   Float_t gridSizeZ   =  fgkTPCZ0/(columns-1);                  // unit in [cm]
 
   // temporary matrices needed for the calculation // for rotational symmetric RZ table, phislices is 1
+  
+  TMatrixD *arrayofErA[kNPhiSlices], *arrayofdEzA[kNPhiSlices]; 
+  TMatrixD *arrayofErC[kNPhiSlices], *arrayofdEzC[kNPhiSlices]; 
 
-  TMatrixD *arrayofErA[phiSlices], *arrayofdEzA[phiSlices]; 
-  TMatrixD *arrayofErC[phiSlices], *arrayofdEzC[phiSlices]; 
-
-  TMatrixD *arrayofEroverEzA[phiSlices], *arrayofDeltaEzA[phiSlices];
-  TMatrixD *arrayofEroverEzC[phiSlices], *arrayofDeltaEzC[phiSlices];
+  TMatrixD *arrayofEroverEzA[kNPhiSlices], *arrayofDeltaEzA[kNPhiSlices];
+  TMatrixD *arrayofEroverEzC[kNPhiSlices], *arrayofDeltaEzC[kNPhiSlices];
 
  
   for ( Int_t k = 0 ; k < phiSlices ; k++ ) {
@@ -308,7 +308,7 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortion() {
   }
  
   // list of points as used during sum up
-  Double_t  rlist1[rows], zedlist1[columns];// , philist1[phiSlices];
+  Double_t  rlist1[kNRows], zedlist1[kNColumns];// , philist1[phiSlices];
   for ( Int_t i = 0 ; i < rows ; i++ )    {
     rlist1[i] = fgkIFCRadius + i*gridSizeR ;
     for ( Int_t j = 0 ; j < columns ; j++ ) { 
@@ -358,8 +358,8 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortion() {
          if (TMath::Abs((coord1(0,ip)*100-rlist1[i]))>1 || 
              TMath::Abs((coord1(2,ip)*100-zedlist1[j])>1)) { 
            AliError("internal error: coordinate system was screwed during the sum-up");
-           printf("sum-up: (r,z)=(%lf,%lf)\n",rlist1[i],zedlist1[j]);
-           printf("lookup: (r,z)=(%lf,%lf)\n",coord1(0,ip)*100,coord1(2,ip)*100);
+           printf("sum-up: (r,z)=(%f,%f)\n",rlist1[i],zedlist1[j]);
+           printf("lookup: (r,z)=(%f,%f)\n",coord1(0,ip)*100,coord1(2,ip)*100);
            AliError("Don't trust the results of the space charge calculation!");
          }
          
@@ -549,7 +549,7 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortion() {
   gridSizeZ   =  fgkTPCZ0/(columns-1);                  // unit in [cm]
  
   // list of points as used during sum up
-  Double_t  rlist2[rows], philist2[phiSlices], zedlist2[columns]; 
+  Double_t  rlist2[kNRows], philist2[kNPhiSlices], zedlist2[kNColumns]; 
   for ( Int_t k = 0 ; k < phiSlices ; k++ ) {
     philist2[k] =  gridSizePhi * k;
     for ( Int_t i = 0 ; i < rows ; i++ )    {
@@ -562,11 +562,11 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortion() {
  
   // temporary matrices needed for the calculation 
 
-  TMatrixD *arrayofErA2[phiSlices], *arrayofEphiA2[phiSlices], *arrayofdEzA2[phiSlices];
-  TMatrixD *arrayofErC2[phiSlices], *arrayofEphiC2[phiSlices], *arrayofdEzC2[phiSlices]; 
+  TMatrixD *arrayofErA2[kNPhiSlices], *arrayofEphiA2[kNPhiSlices], *arrayofdEzA2[kNPhiSlices];
+  TMatrixD *arrayofErC2[kNPhiSlices], *arrayofEphiC2[kNPhiSlices], *arrayofdEzC2[kNPhiSlices]; 
 
-  TMatrixD *arrayofEroverEzA2[phiSlices], *arrayofEphioverEzA2[phiSlices], *arrayofDeltaEzA2[phiSlices]; 
-  TMatrixD *arrayofEroverEzC2[phiSlices], *arrayofEphioverEzC2[phiSlices], *arrayofDeltaEzC2[phiSlices]; 
+  TMatrixD *arrayofEroverEzA2[kNPhiSlices], *arrayofEphioverEzA2[kNPhiSlices], *arrayofDeltaEzA2[kNPhiSlices]; 
+  TMatrixD *arrayofEroverEzC2[kNPhiSlices], *arrayofEphioverEzC2[kNPhiSlices], *arrayofDeltaEzC2[kNPhiSlices]; 
 
  
   for ( Int_t k = 0 ; k < phiSlices ; k++ ) {
@@ -620,7 +620,7 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortion() {
     Double_t weightA = GetSpaceChargeDensity(r0*100,phi0, 0.499, 2);  // partial load in r,phi
     Double_t weightC = GetSpaceChargeDensity(r0*100,phi0,-0.499, 2);  // partial load in r,phi
   
-    //    printf("-----\n%lf %lf : %e %e\n",r0,phi0,weightA,weightC);
+    //    printf("-----\n%f %f : %e %e\n",r0,phi0,weightA,weightC);
 
     // Summing up the vector components according to their weight
 
@@ -634,8 +634,8 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortion() {
              TMath::Abs((coord2(1,ip)-philist2[k]))>1 || 
              TMath::Abs((coord2(2,ip)*100-zedlist2[j]))>1) { 
            AliError("internal error: coordinate system was screwed during the sum-up");
-           printf("lookup: (r,phi,z)=(%lf,%lf,%lf)\n",coord2(0,ip)*100,coord2(1,ip),coord2(2,ip)*100);
-           printf("sum-up: (r,phi,z)=(%lf,%lf,%lf)\n",rlist2[i],philist2[k],zedlist2[j]);
+           printf("lookup: (r,phi,z)=(%f,%f,%f)\n",coord2(0,ip)*100,coord2(1,ip),coord2(2,ip)*100);
+           printf("sum-up: (r,phi,z)=(%f,%f,%f)\n",rlist2[i],philist2[k],zedlist2[j]);
            AliError("Don't trust the results of the space charge calculation!");
          }
          
@@ -684,7 +684,7 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortion() {
       weightA = GetSpaceChargeDensity(r0*100,phi0R, 0.499, 2);  // partial load in r,phi
       weightC = GetSpaceChargeDensity(r0*100,phi0R,-0.499, 2);  // partial load in r,phi
     
-      // printf("%lf %lf : %e %e\n",r0,phi0R,weightA,weightC);
+      // printf("%f %f : %e %e\n",r0,phi0R,weightA,weightC);
          
       // Summing up the vector components according to their weight
       ip = 0;
@@ -733,7 +733,7 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortion() {
 
     ipC++; // POC configuration counter
 
-    //   printf("POC: (r,phi,z) = (%lf %lf %lf) | weight(A,C): %03.1lf %03.1lf\n",r0,phi0,z0, weightA, weightC);
+    //   printf("POC: (r,phi,z) = (%f %f %f) | weight(A,C): %03.1lf %03.1lf\n",r0,phi0,z0, weightA, weightC);
     
   }
 
@@ -945,11 +945,11 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortionCourse() {
   const Float_t gridSizeZ   =  fgkTPCZ0/(columns-1);                  // unit in [cm]
  
   // temporary matrices needed for the calculation
-  TMatrixD *arrayofErA[phiSlices], *arrayofEphiA[phiSlices], *arrayofdEzA[phiSlices];
-  TMatrixD *arrayofErC[phiSlices], *arrayofEphiC[phiSlices], *arrayofdEzC[phiSlices];
+  TMatrixD *arrayofErA[kNPhiSlices], *arrayofEphiA[kNPhiSlices], *arrayofdEzA[kNPhiSlices];
+  TMatrixD *arrayofErC[kNPhiSlices], *arrayofEphiC[kNPhiSlices], *arrayofdEzC[kNPhiSlices];
 
-  TMatrixD *arrayofEroverEzA[phiSlices], *arrayofEphioverEzA[phiSlices], *arrayofDeltaEzA[phiSlices];
-  TMatrixD *arrayofEroverEzC[phiSlices], *arrayofEphioverEzC[phiSlices], *arrayofDeltaEzC[phiSlices];
+  TMatrixD *arrayofEroverEzA[kNPhiSlices], *arrayofEphioverEzA[kNPhiSlices], *arrayofDeltaEzA[kNPhiSlices];
+  TMatrixD *arrayofEroverEzC[kNPhiSlices], *arrayofEphioverEzC[kNPhiSlices], *arrayofDeltaEzC[kNPhiSlices];
 
  
   for ( Int_t k = 0 ; k < phiSlices ; k++ ) {
@@ -974,7 +974,7 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortionCourse() {
   }
  
   // list of points as used in the interpolation (during sum up)
-  Double_t  rlist[rows], zedlist[columns] , philist[phiSlices];
+  Double_t  rlist[kNRows], zedlist[kNColumns] , philist[kNPhiSlices];
   for ( Int_t k = 0 ; k < phiSlices ; k++ ) {
     philist[k] =  gridSizePhi * k;
     for ( Int_t i = 0 ; i < rows ; i++ )    {
@@ -1029,8 +1029,8 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortionCourse() {
              TMath::Abs((coord(1,ip)-philist[k]))>1 || 
              TMath::Abs((coord(2,ip)*100-zedlist[j]))>1) { 
            AliError("internal error: coordinate system was screwed during the sum-up");
-           printf("lookup: (r,phi,z)=(%lf,%lf,%lf)\n",coord(0,ip)*100,coord(1,ip),coord(2,ip)*100);
-           printf("sum-up: (r,phi,z)=(%lf,%lf,%lf)\n",rlist[i],philist[k],zedlist[j]);
+           printf("lookup: (r,phi,z)=(%f,%f,%f)\n",coord(0,ip)*100,coord(1,ip),coord(2,ip)*100);
+           printf("sum-up: (r,phi,z)=(%f,%f,%f)\n",rlist[i],philist[k],zedlist[j]);
            AliError("Don't trust the results of the space charge calculation!");
          }
          
@@ -1084,7 +1084,7 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortionCourse() {
       weightA = GetSpaceChargeDensity(r0*100,phi0, z0*100); 
       weightC = GetSpaceChargeDensity(r0*100,phi0,-z0*100);
       
-      //     printf("%lf %lf %lf: %e %e\n",r0,phi0,z0,weightA,weightC);
+      //     printf("%f %f %f: %e %e\n",r0,phi0,z0,weightA,weightC);
        
       // Summing up the vector components according to their weight
       ip = 0;
@@ -1134,7 +1134,7 @@ void AliTPCSpaceCharge3D::InitSpaceCharge3DDistortionCourse() {
     } // end phi-POC summation (phiiC)
    
 
-    // printf("POC: (r,phi,z) = (%lf %lf %lf) | weight(A,C): %03.1lf %03.1lf\n",r0,phi0,z0, weightA, weightC);
+    // printf("POC: (r,phi,z) = (%f %f %f) | weight(A,C): %03.1lf %03.1lf\n",r0,phi0,z0, weightA, weightC);
     
   }
 
@@ -1420,7 +1420,7 @@ Float_t  AliTPCSpaceCharge3D::GetSpaceChargeDensity(Float_t r, Float_t phi, Floa
     sc = 0;
   }
   
-  //  printf("%lf %lf %lf: %lf\n",r,phi,z,sc);
+  //  printf("%f %f %f: %f\n",r,phi,z,sc);
   
   return sc;
 }

diff --git a/TPC/AliTPCSpaceCharge3D.h b/TPC/AliTPCSpaceCharge3D.h
index b69b7fdc74f614f26663bc3ae676f752132e6251..23c76c99e0ec5136bcea19cfac81513497059761 100644 (file)
--- a/TPC/AliTPCSpaceCharge3D.h
+++ b/TPC/AliTPCSpaceCharge3D.h
@@ -55,6 +55,11 @@ protected:
 
 private:
 
+  // maximum sizes of lookup tables
+  enum {kNRows= 90 };       // the maximum on row-slices so far ~ 2cm slicing    
+  enum {kNPhiSlices= 144 }; // the maximum of phi-slices so far = (8 per sector) 
+  enum {kNColumns= 130 };   // the maximum on column-slices so  ~ 2cm slicing    
+
   AliTPCSpaceCharge3D(const AliTPCSpaceCharge3D &);               // not implemented
   AliTPCSpaceCharge3D &operator=(const AliTPCSpaceCharge3D &);    // not implemented