///////////////////////////////////////////////////////////////////////////////
#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"
AliACORDE::AliACORDE()
: AliDetector(),
fCreateCavern(0),
- fITSGeometry(0)
+ f4CentralModulesGeometry(0)
{
//
// Default constructor
AliACORDE::AliACORDE(const char *name, const char *title)
: AliDetector(name, title),
fCreateCavern(kFALSE),
- fITSGeometry(kTRUE)
+ f4CentralModulesGeometry(kTRUE)
{
//
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.
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.
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 ) {
// 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));
}
//_____________________________________________________________________________
}
//_____________________________________________________________________________
-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/ACORDE_";
- TString snstr1="ACORDE/Array";
- TString volpath, symname;
-
- for(Int_t cnt=1; cnt<=1; 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()));
- }
-
-}