Minor changes

diff --git a/ZDC/AliZDCDigit.cxx b/ZDC/AliZDCDigit.cxx
index b72d437e955fe73604abb69e464f4d8840d36b2c..43745cf5303d95219a7052f7b4c8f3981d60fc26 100644 (file)
--- a/ZDC/AliZDCDigit.cxx
+++ b/ZDC/AliZDCDigit.cxx
@@ -17,7 +17,7 @@
 //
 //             Class for ZDC digit 
 //           ADC Channels for each PM 
-//        5 for hadronic ZDCs 1 for EM ZDCs
+//        5 for hadronic ZDCs 2 for EM ZDCs
 //
 //**********************************************************************
 
@@ -31,10 +31,9 @@ ClassImp(AliZDCDigit)
 {
   // Default constructor 
   
-  fSector[0]   = 0;
-  fSector[1]   = 0;
-  fADCValue[0] = 0;  
-  fADCValue[1] = 0;  
+  Int_t i;
+  for(i=0; i<2; i++) fSector[i] = 0;
+  for(i=0; i<2; i++) fADCValue[i] = 0;  
 }
 
 //____________________________________________________________________________

diff --git a/ZDC/AliZDCv2.cxx b/ZDC/AliZDCv2.cxx
index ac348c3c87d47976e0f78e364baf2b2988e77112..1c2b55bedf1f023cf991005448ed99a95142cd7e 100644 (file)
--- a/ZDC/AliZDCv2.cxx
+++ b/ZDC/AliZDCv2.cxx
@@ -898,7 +898,10 @@ void AliZDCv2::CreateMaterials()
   // Create Materials for the Zero Degree Calorimeter
   //
   
+  Int_t *idtmed = fIdtmed->GetArray();
+  
   Float_t dens, ubuf[1], wmat[2], a[2], z[2];
+  Int_t i;
   
   // --- Store in UBUF r0 for nuclear radius calculation R=r0*A**1/3 
 
@@ -1012,37 +1015,8 @@ void AliZDCv2::CreateMaterials()
   AliMedium(12,"ZAIR", 12, isvol, inofld, nofieldm, tmaxfd, stemax, deemax, epsil, stmin);
   //
   AliMedium(11,"ZVOIM", 11, isvol, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin);
-  AliMedium(13,"ZIRONE",13, isvol, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin);  
-} 
-
-//_____________________________________________________________________________
-void AliZDCv2::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.
- //
- Int_t modnum = 0;
- TString volpath1 = "ALIC_1/ZDC_1/ZNEU_1";
- TString volpath2 = "ALIC_1/ZDC_1/ZPRO_1";
-
- TString symname1="ZDC/NeutronZDC";
- TString symname2="ZDC/ProtonZDC";
-
- if(!gGeoManager->SetAlignableEntry(symname1.Data(),volpath1.Data()))
-     AliFatal(Form("Alignable entry %s not created. Volume path %s not valid",   symname1.Data(),volpath1.Data()));
-
- if(!gGeoManager->SetAlignableEntry(symname2.Data(),volpath2.Data()))
-     AliFatal(Form("Alignable entry %s not created. Volume path %s not valid",   symname2.Data(),volpath2.Data()));
-}
-
-//_____________________________________________________________________________
-void AliZDCv2::Init()
-{
- InitTables();
-  Int_t i;
-  Int_t *idtmed = fIdtmed->GetArray();
+  AliMedium(13,"ZIRONE",13, isvol, ifield, fieldm, tmaxfd, stemax, deemax, epsil, stmin);
+  
   // Thresholds for showering in the ZDCs 
   i = 1; //tantalum
   gMC->Gstpar(idtmed[i], "CUTGAM", .001);
@@ -1138,7 +1112,34 @@ void AliZDCv2::Init()
   fMedSensZEM = idtmed[5];  // Sensitive volume: ZEM passive material
   fMedSensTDI = idtmed[6];  // Sensitive volume: TDI Cu shield
   fMedSensPI  = idtmed[7];  // Sensitive volume: beam pipes
-  fMedSensGR  = idtmed[12]; // Sensitive volume: air into the grooves  
+  fMedSensGR  = idtmed[12]; // Sensitive volume: air into the grooves
+} 
+
+//_____________________________________________________________________________
+void AliZDCv2::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 volpath1 = "ALIC_1/ZDC_1/ZNEU_1";
+ TString volpath2 = "ALIC_1/ZDC_1/ZPRO_1";
+
+ TString symname1="ZDC/NeutronZDC";
+ TString symname2="ZDC/ProtonZDC";
+
+ if(!gGeoManager->SetAlignableEntry(symname1.Data(),volpath1.Data()))
+     AliFatal(Form("Alignable entry %s not created. Volume path %s not valid",   symname1.Data(),volpath1.Data()));
+
+ if(!gGeoManager->SetAlignableEntry(symname2.Data(),volpath2.Data()))
+     AliFatal(Form("Alignable entry %s not created. Volume path %s not valid",   symname2.Data(),volpath2.Data()));
+}
+
+//_____________________________________________________________________________
+void AliZDCv2::Init()
+{
+ InitTables();
 }
 
 //_____________________________________________________________________________