AliDecayer realisation for the EvtGen code and EvtGen itself.

[u/mrichter/AliRoot.git] / ACORDE / AliACORDE.cxx

diff --git a/ACORDE/AliACORDE.cxx b/ACORDE/AliACORDE.cxx
index 7a0ad5cb9dc197838a88a6ac25f75514862afc50..ae22d935c8c4045a51a9e819087d9feff1690658 100644 (file)
--- a/ACORDE/AliACORDE.cxx
+++ b/ACORDE/AliACORDE.cxx
@@ -38,10 +38,11 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <TClonesArray.h>
-#include <TTree.h>
-#include <TVirtualMC.h>
+#include <TGeoGlobalMagField.h>
 #include <TGeoManager.h>
 #include <TStopwatch.h>
+#include <TTree.h>
+#include <TVirtualMC.h>
 
 #include "AliACORDE.h"
 #include "AliMagF.h"
@@ -55,7 +56,7 @@ ClassImp(AliACORDE)
 AliACORDE::AliACORDE()
   : AliDetector(),
     fCreateCavern(0),
-    fITSGeometry(0)
+    f4CentralModulesGeometry(0)
 {
   //
   // Default constructor
@@ -66,7 +67,7 @@ AliACORDE::AliACORDE()
 AliACORDE::AliACORDE(const char *name, const char *title)
   : AliDetector(name, title),
     fCreateCavern(kFALSE),
-    fITSGeometry(kTRUE)
+    f4CentralModulesGeometry(kTRUE)
 
 {
   //
@@ -85,8 +86,8 @@ AliACORDE::~AliACORDE()
 void AliACORDE::CreateMaterials()
 {
   // Magnatic field inside the pit
-  Int_t   isxfld = gAlice->Field()->Integ();
-  Float_t sxmgmx = gAlice->Field()->Max();
+  Int_t   isxfld = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();
+  Float_t sxmgmx = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();
 
   //Magnetic field above the Magnet.
   Int_t xfield = 0;   // no Magnetic field.
@@ -281,7 +282,7 @@ void AliACORDE::Digits2Raw()
 
   // 4. Write raw data
   AliACORDERawData rawdata;
-  rawdata.WriteACORDERawData(Modules);
+  rawdata.WriteACORDERawData(Modules,(ndig > 1));
 }
 
 //_____________________________________________________________________________
@@ -338,24 +339,3 @@ Bool_t AliACORDE::Raw2SDigits(AliRawReader* rawReader)
 }
 
 //_____________________________________________________________________________
-void AliACORDE::AddAlignableVolumes() const
-{
-  //
-  // Create entries for alignable volumes associating the symbolic volume
-  // name with the corresponding volume path. Needs to be syncronized with
-  // eventual changes in the geometry.
-  // 
-  TString vpstr1 = "ALIC_1/ACORDE1_";
-  TString snstr1="ACORDE/Array";
-  TString volpath, symname;
-  
-  for(Int_t cnt=1; cnt<=3; cnt++){
-    volpath = vpstr1;
-    volpath += cnt;
-    symname = snstr1;
-    symname += cnt;
-    if(!gGeoManager->SetAlignableEntry(symname.Data(),volpath.Data()))
-      AliFatal(Form("Alignable entry %s not created. Volume path %s not valid", symname.Data(),volpath.Data()));
-  }
-
-}