X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ACORDE%2FAliACORDE.cxx;h=1fcb9766be615dcf4e729c6cf96b1d60489cd67a;hb=60c4efc47125cb932981347f45bd14f9beecc2a7;hp=7a0ad5cb9dc197838a88a6ac25f75514862afc50;hpb=6fb64ed1e8d08bc6c227f0b8da4d2be31f2d7604;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ACORDE/AliACORDE.cxx b/ACORDE/AliACORDE.cxx
index 7a0ad5cb9dc..1fcb9766be6 100644
--- 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.
@@ -131,7 +132,7 @@ void AliACORDE::CreateMaterials()
   Float_t zMolasse[10] = {1., 6., 8., 11., 12., 13., 14., 19., 20., 26.};
   Float_t wMolasse[10] = {0.008, 0.043, 0.485, 0.007, 0.042, 0.037, 0.215, 0.023, 0.1, 0.04};
   Float_t dMolasse = 2.40;
-  AliMixture(24, "Molasse$", aMolasse, zMolasse, dMolasse, 10, wMolasse);
+  AliMixture(24, "Molasse$", aMolasse, zMolasse, 2*dMolasse, 10, wMolasse); // correction to density of molasse alpine newDen=2*dmolasse
 
   // **************** 
   //     Defines tracking media parameters. 
@@ -199,7 +200,7 @@ void AliACORDE::SetTreeAddress()
 
   TBranch *branch;
   char branchname[20];
-  sprintf(branchname,"%s",GetName());
+  snprintf(branchname,19,"%s",GetName());
   // Branch address for hit tree
   TTree *treeH = fLoader->TreeH();
   if (treeH ) {
@@ -233,11 +234,11 @@ AliLoader* AliACORDE::MakeLoader(const char* topfoldername)
 }
 
 
-AliDigitizer* AliACORDE::CreateDigitizer(AliRunDigitizer* manager) const
+AliDigitizer* AliACORDE::CreateDigitizer(AliDigitizationInput* digInput) const
 {
   //
   //
-  return new AliACORDEDigitizer(manager);
+  return new AliACORDEDigitizer(digInput);
 }
 
 void AliACORDE::Digits2Raw()
@@ -274,14 +275,14 @@ void AliACORDE::Digits2Raw()
     // 2.3 set the array entry for each digit
     AliACORDEdigit* digit = (AliACORDEdigit*) adigits->At(idig);
     Int_t mod = digit->GetModule();
-    Modules[mod-1]=kTRUE;
+    Modules[mod]=kTRUE;
   } 
   // 3. Unload digits
   fLoader->UnloadDigits();
 
   // 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()));
-  }
-
-}