strdup replaced by malloc and strcpy

[u/mrichter/AliRoot.git] / STRUCT / AliFRAMEv2.cxx

diff --git a/STRUCT/AliFRAMEv2.cxx b/STRUCT/AliFRAMEv2.cxx
index e94d4d464fde66e931eae979c1ce2e6dbb08e3c4..677296e4333568245d8e4f1760a84e00c6579c4a 100644 (file)
--- a/STRUCT/AliFRAMEv2.cxx
+++ b/STRUCT/AliFRAMEv2.cxx
@@ -463,7 +463,7 @@ void AliFRAMEv2::CreateGeometry()
 
 // The internal frame
 //
-  char*  module[3] = {"B071\0", "B074\0", "B075\0"};
+  const char*  module[3] = {"B071\0", "B074\0", "B075\0"};
 //
 //
 //  Mother Volumes
@@ -894,9 +894,7 @@ void AliFRAMEv2::CreateGeometry()
       ptrd1[2] = 375.5;
       ptrd1[3] = 14.5;
       gMC->Gsvolu("BTO1", "TRD1", kAir, ptrd1, 4);
-      ptrd1[2] = 156.75;
       gMC->Gsvolu("BTO2", "TRD1", kAir, ptrd1, 4);
-      ptrd1[2] =  79.75;
       gMC->Gsvolu("BTO3", "TRD1", kAir, ptrd1, 4);  
       
 
@@ -907,10 +905,9 @@ void AliFRAMEv2::CreateGeometry()
       gMC->Gspos("BTR3", 2, "B075", 0.,  295.75, -10.8,            0, "ONLY");
 
       gMC->Gspos("BTO1", 1, "B071", 0.,    0.00, 42.69,            0, "ONLY");
-      gMC->Gspos("BTO2", 1, "B074", 0., -218.75, 42.69, idrotm[2070], "ONLY");
-      gMC->Gspos("BTO2", 2, "B074", 0.,  218.75, 42.69,            0, "ONLY");
-      gMC->Gspos("BTO3", 1, "B075", 0., -295.75, 42.69, idrotm[2070], "ONLY");
-      gMC->Gspos("BTO3", 2, "B075", 0.,  295.75, 42.69,            0, "ONLY");
+      gMC->Gspos("BTO2", 1, "B074", 0.,    0.00, 42.69,            0, "ONLY");
+      gMC->Gspos("BTO3", 1, "B075", 0.,    0.00, 42.69,            0, "ONLY");
+
   }
   
 //
@@ -998,9 +995,6 @@ void AliFRAMEv2::CreateGeometry()
   gMC->Gsvolu("BFII", "TUBE", kAir, tpar, 3);  
   gMC->Gspos("BFII", 1, "BFIR", 0., 0., 0., 0, "ONLY");  
 
-  dz = kBFMdz/2. -  kBFRdz / 2.;
-  gMC->Gspos("BFIR", 1, "BFMO", 0., 0., dz, 0, "ONLY");  
-
   //
   // Outer RING
   tpar[0] =  kBFMRou - kBFRdr;
@@ -1144,11 +1138,11 @@ void AliFRAMEv2::CreateGeometry()
   gMC->Gsvolu("BBLL", "BOX ", kAir, bpar, 3); 
   gMC->Gspos("BBLL", 1, "BBLB", 0., 0., 0., 0, "ONLY"); 
 
-  dx = kBBMRin + kBBBdz/2.;
+  dx = kBBMRin + kBBBdz/2. + (bpar[1] + kBBBdd) * TMath::Sin(10. * kDegrad);
   dy = dx * TMath::Tan(10. * kDegrad) - kBBBdz/2./TMath::Cos(10. * kDegrad);
   gMC->Gspos("BBLB", 1, "BBCE", dx, dy, 0., idrotm[2052], "ONLY"); 
 
-  dx = kBBMRou - kBBBdz/2.;
+  dx = kBBMRou - kBBBdz/2. - (bpar[1] + kBBBdd) * TMath::Sin(10. * kDegrad);
   dy = dx * TMath::Tan(10. * kDegrad) - kBBBdz/2./TMath::Cos(10. * kDegrad);
  
   gMC->Gspos("BBLB", 2, "BBCE", dx, dy, 0., idrotm[2052], "ONLY");