Few corrections to previous checkin

diff --git a/PHOS/AliPHOS.cxx b/PHOS/AliPHOS.cxx
index f261b4f152c76c817a184d015595683648ed8fbe..69ebedf1913e7686665b51e97eaa01656e91e8a0 100644 (file)
--- a/PHOS/AliPHOS.cxx
+++ b/PHOS/AliPHOS.cxx
@@ -288,8 +288,8 @@ void AliPHOS::CreateMaterials()
   // DEFINITION OF THE TRACKING MEDIA
 
   // for PHOS: idtmed[699->798] equivalent to fIdtmed[0->100]
-  Int_t   isxfld = AliSimulation::Instance()->GetMCApp()->Field()->Integ() ;
-  Float_t sxmgmx = AliSimulation::Instance()->GetMCApp()->Field()->Max() ;
+  Int_t   isxfld = gAlice->Field()->Integ() ;
+  Float_t sxmgmx = gAlice->Field()->Max() ;
 
   // The scintillator of the calorimeter made of PBW04                              -> idtmed[699]
   AliMedium(0, "PHOS Xtal    $", 0, 1,

diff --git a/PHOS/AliPHOSvImpacts.cxx b/PHOS/AliPHOSvImpacts.cxx
index c5016a344d09f43ff1f5f55bc04975f26588abf1..9360fccbfcc9b22ba3e5ec30b9ee098666899e67 100644 (file)
--- a/PHOS/AliPHOSvImpacts.cxx
+++ b/PHOS/AliPHOSvImpacts.cxx
@@ -172,8 +172,8 @@ void AliPHOSvImpacts::MakeBranch(Option_t *opt)
   
   Int_t bufferSize = 32000 ;
   Int_t splitlevel = 0 ;
-  TreeH()->Branch("PHOSEmcImpacts" , "TList", &fEMCImpacts , bufferSize, splitlevel);
-  TreeH()->Branch("PHOSCpvImpacts" , "TList", &fCPVImpacts , bufferSize, splitlevel);
+  fLoader->TreeH()->Branch("PHOSEmcImpacts" , "TList", &fEMCImpacts , bufferSize, splitlevel);
+  fLoader->TreeH()->Branch("PHOSCpvImpacts" , "TList", &fCPVImpacts , bufferSize, splitlevel);
   
 }
 

diff --git a/STEER/AliMC.cxx b/STEER/AliMC.cxx
index 0f1af88592138f69cf68c24f8f732811c6913eed..2b01f9186eaf6b90e29ed0b2ef7429325f1913d0 100644 (file)
--- a/STEER/AliMC.cxx
+++ b/STEER/AliMC.cxx
@@ -38,7 +38,6 @@
 #include "AliHeader.h"
 #include "AliLego.h"
 #include "AliMC.h"
-#include "AliMCQA.h"
 #include "AliRun.h"
 #include "AliHit.h"
 #include "AliStack.h"
@@ -66,7 +65,6 @@ AliMC::AliMC() :
   fDecayPdg(0),
   fImedia(0),
   fTransParName("\0"),
-  fMCQA(0),
   fHitLists(0),
   fTmpTreeTR(0),
   fTmpFileTR(0),
@@ -92,7 +90,6 @@ AliMC::AliMC(const char *name, const char *title) :
   fDecayPdg(0),
   fImedia(new TArrayI(1000)),
   fTransParName("\0"),
-  fMCQA(0),
   fHitLists(new TList()),
   fTmpTreeTR(0),
   fTmpFileTR(0),
@@ -113,7 +110,6 @@ AliMC::~AliMC()
   //destructor
   delete fGenerator;
   delete fImedia;
-  delete fMCQA;
   delete fHitLists;
   // Delete track references
 }
@@ -310,7 +306,6 @@ void AliMC::PreTrack()
        if((module = dynamic_cast<AliModule*>(dets[i])))
         module->PreTrack();
 
-     fMCQA->PreTrack();
 }
 
 //_______________________________________________________________________
@@ -355,7 +350,6 @@ void AliMC::Stepping()
     //Call the appropriate stepping routine;
     AliModule *det = dynamic_cast<AliModule*>(gAlice->Modules()->At(id));
     if(det && det->StepManagerIsEnabled()) {
-      if(AliLog::GetGlobalDebugLevel()>0) fMCQA->StepManager(id);
       det->StepManager();
     }
   }
@@ -704,9 +698,6 @@ void AliMC::Init()
    fSummEnergy.Set(gMC->NofVolumes()+1);
    fSum2Energy.Set(gMC->NofVolumes()+1);
 
-   //
-   fMCQA = new AliMCQA(gAlice->GetNdets());
-
    // Register MC in configuration 
    AliConfig::Instance()->Add(gMC);
 
@@ -882,18 +873,6 @@ void AliMC::SetTransPar(const char *filename)
   fTransParName = filename;
 }
 
-//_______________________________________________________________________
-void AliMC::Browse(TBrowser *b)
-{
-  //
-  // Called when the item "Run" is clicked on the left pane
-  // of the Root browser.
-  // It displays the Root Trees and all detectors.
-  //
-  //detectors are in folders anyway
-  b->Add(fMCQA,"AliMCQA");
-}
-
 //_______________________________________________________________________
 void AliMC::AddHit(Int_t id, Int_t track, Int_t *vol, Float_t *hits) const
 {

diff --git a/STEER/AliMC.h b/STEER/AliMC.h
index 7d78e7bac56d86afa40315bb14b0c52e1a28a57f..531d65e30dd29bb4d226a4bdc0042c1f53341cf2 100644 (file)
--- a/STEER/AliMC.h
+++ b/STEER/AliMC.h
@@ -23,7 +23,6 @@ class TFile;
 class TTree;
 
 class AliGenerator;
-class AliMCQA;
 class AliTrackReference;
 
 class AliMC : public TVirtualMCApplication {
@@ -73,8 +72,6 @@ public:
    
    virtual  void  Init();
    virtual  void  SetTransPar(const char *filename="$(ALICE_ROOT)/data/galice.cuts");
-   virtual  void  Browse(TBrowser *b);
-   AliMCQA       *GetMCQA() const {return fMCQA;}
    //PH
    virtual  void  AddHit(Int_t id, Int_t track, Int_t *vol, Float_t *hits) const;
    virtual  void  AddDigit(Int_t id, Int_t *tracks, Int_t *digits) const;
@@ -126,7 +123,6 @@ public:
    Int_t          fDecayPdg;          //  PDG code of particle with forced decay length
    TArrayI       *fImedia;            //! Array of correspondence between media and detectors
    TString        fTransParName;      //  Name of the transport parameters file
-   AliMCQA       *fMCQA;              //  Pointer to MC Quality assurance class
    TList         *fHitLists;          //! Lists of hits to be remapped by PurifyKine
    //Temporary Track Reference tree related
    TTree         *fTmpTreeTR;            //! Temporary track reference tree

diff --git a/STEER/AliMagF.cxx b/STEER/AliMagF.cxx
index 7b00a359f8cfa85b832a491a6614d603f882ed4f..14a73562045b6d982669f5ae48fabbb535337a0e 100644 (file)
--- a/STEER/AliMagF.cxx
+++ b/STEER/AliMagF.cxx
@@ -86,7 +86,7 @@ AliMagF::AliMagF(const AliMagF &src):
 }
 
 //_______________________________________________________________________
-void AliMagF::Field(const float*, float *b) const
+void AliMagF::Field(const Float_t*, Float_t *b) const
 {
   //
   // Method to return the field in one point -- dummy in this case
@@ -106,7 +106,7 @@ void AliMagF::Field(const double*, double *b) const
 }
 
 //_______________________________________________________________________
-void AliMagF::GetTPCInt(Float_t *, Float_t *b) const
+void AliMagF::GetTPCInt(const Float_t *, Float_t *b) const
 {
 //
 // Obtain the integral of the field components in the TPC from given point
@@ -117,7 +117,7 @@ void AliMagF::GetTPCInt(Float_t *, Float_t *b) const
 }
 
 //_______________________________________________________________________
-void AliMagF::GetTPCIntCyl(Float_t *, Float_t *b) const
+void AliMagF::GetTPCIntCyl(const Float_t *, Float_t *b) const
 {
 //    
 // Obtain the integral of the field components in the TPC from given point

diff --git a/STEER/AliMagF.h b/STEER/AliMagF.h
index d7690827ad1647e21c42ad41734ffc3c55ce5f15..3822d477e2aa8b8b64ffdb023bfd0f1fc16874d9 100644 (file)
--- a/STEER/AliMagF.h
+++ b/STEER/AliMagF.h
@@ -24,10 +24,10 @@ public:
   AliMagF(const AliMagF& maps);
   virtual ~AliMagF() {}
   AliMagF& operator=(const AliMagF& rhs);
-  virtual void    Field(const float *x, float *b)                  const;
-  virtual void    Field(const double *x, double *b)                const;
-  virtual void    GetTPCInt(Float_t *xyz, Float_t *b)        const;
-  virtual void    GetTPCIntCyl(Float_t *rphiz, Float_t *b)   const;
+  virtual void    Field(const Float_t *x, Float_t *b)                  const;
+  virtual void    Field(const Double_t *x, Double_t *b)                const;
+  virtual void    GetTPCInt(const Float_t *xyz, Float_t *b)        const;
+  virtual void    GetTPCIntCyl(const Float_t *rphiz, Float_t *b)   const;
   virtual Int_t   Type() const {return fType;}
   virtual Float_t Max() const {return fMax;}
   virtual Int_t   Map() const {return fMap;}

diff --git a/STEER/AliTracker.cxx b/STEER/AliTracker.cxx
index 33d3b384a71db6c6015af7b80936bedbb60b2100..355c539ef45b38cb28d4a2ae16f086b181fbb59d 100644 (file)
--- a/STEER/AliTracker.cxx
+++ b/STEER/AliTracker.cxx
@@ -178,7 +178,7 @@ Double_t AliTracker::GetBz(const Float_t *r) {
 }
 
 Double_t 
-AliTracker::MeanMaterialBudget(const Double_t *start, const Double_t *end, const Double_t *mparam)
+AliTracker::MeanMaterialBudget(const Double_t *start, const Double_t *end, Double_t *mparam)
 {
   // 
   // Calculate mean material budget and material properties between 

diff --git a/STEER/AliTracker.h b/STEER/AliTracker.h
index 02aa57353cce46add5211d1a72508be96bccb679..384170579dca0cf05bddb844881d19a4a3998476 100644 (file)
--- a/STEER/AliTracker.h
+++ b/STEER/AliTracker.h
@@ -54,7 +54,7 @@ public:
   Double_t GetSigmaZ() const {return fSigmaZ;}
 
   static 
-  Double_t MeanMaterialBudget(const Double_t *start, const Double_t *end, const Double_t *mparam);
+  Double_t MeanMaterialBudget(const Double_t *start, const Double_t *end, Double_t *mparam);
   static
   Bool_t PropagateTrackTo(AliExternalTrackParam *track, Double_t x, Double_t m,
         Double_t maxStep, Bool_t rotateTo=kTRUE, Double_t maxSnp=0.8);  

diff --git a/TRD/AliTRDtrigger.cxx b/TRD/AliTRDtrigger.cxx
index 5112b452da7ccaf3a25a4d6611f96fbd6a4d24c6..29edf56410deeb5241f23da8dbc9c2672d5cffc6 100644 (file)
--- a/TRD/AliTRDtrigger.cxx
+++ b/TRD/AliTRDtrigger.cxx
@@ -209,7 +209,7 @@ void AliTRDtrigger::Init()
   fTracks->Clear();
 
   // The magnetic field strength
-  Double_t x[3] = { 0.0, 0.0, 0.0 };
+  const Double_t x[3] = { 0.0, 0.0, 0.0 };
   Double_t b[3];
   gAlice->Field(x,b);  // b[] is in kilo Gauss
   fField = b[2] * 0.1; // Tesla