New binning for default histograms. Updated defaults (checked on PbPb run 137161)

[u/mrichter/AliRoot.git] / ITS / AliITSv11Hybrid.cxx

diff --git a/ITS/AliITSv11Hybrid.cxx b/ITS/AliITSv11Hybrid.cxx
index d58d14661d5ceabba0a03134a2aba1ad56585609..0d6232a224a2241b7e26a9bbd7f9d851cd436490 100644 (file)
--- a/ITS/AliITSv11Hybrid.cxx
+++ b/ITS/AliITSv11Hybrid.cxx
@@ -1661,7 +1661,7 @@ void AliITSv11Hybrid::CreateOldGeometry(){
     //     invisible
     //    gMC->Gspos("ITSV", 1, "ALIC", 0., 0., 0., 0, "ONLY");
     //gMC->Gspos("ITSV", 1, "ALIC", 0., 0., 0., idrotm[199], "MANY");
-    //gMC->Gsatt("ITSV", "SEEN", 0);
+    //gGeoManager->SetVolumeAttribute("ITSV", "SEEN", 0);
 
     //gMC->Gspos("ITSV", 1, "ALIC", 0., 0., 0., 0, "MANY"); //=== LG
     gMC->Gspos("ITSV", 1, "ALIC", 0., 0., 0., 0, "ONLY"); //=== LG
@@ -1702,7 +1702,7 @@ void AliITSv11Hybrid::CreateOldGeometry(){
     // --- Place the ghost volume in its mother volume (ITSV) and make it 
     //     invisible
     //gMC->Gspos("ITSD", 1, "ITSV", 0., 0., 0., 0, "ONLY");
-    //gMC->Gsatt("ITSD", "SEEN", 0);
+    //gGeoManager->SetVolumeAttribute("ITSD", "SEEN", 0);
 
     //======================================================================
     // Let's make ITSD an assembly, because we can then add the new geometry
@@ -6103,6 +6103,36 @@ void AliITSv11Hybrid::CreateMaterials(){
     den = 2.69;
     AliMixture(34,"HOKOTOL$",aA,zZ,den,+10,wW);
     AliMedium(34,"HOKOTOL$",34,0,ifield,fieldm,tmaxfd,stemax,deemax,epsil,stmin);
+
+    // Ergal (7075) (yet another Aluminium alloy) - 09 nov 10
+    // A,Z from Root TGeoElementTable, W from Web sites
+    zZ[0] = 13.0; aA[0] =  26.9815; // Aluminium
+    zZ[1] = 29.0; aA[1] =  63.546 ; // Copper
+    zZ[2] = 26.0; aA[2] =  55.845 ; // Iron
+    zZ[3] = 25.0; aA[3] =  54.938 ; // Manganese
+    zZ[4] = 12.0; aA[4] =  24.305 ; // Magnesium
+    zZ[5] = 14.0; aA[5] =  28.0855; // Silicon
+    zZ[6] = 30.0; aA[6] =  65.39  ; // Zinc
+    zZ[7] = 24.0; aA[7] =  51.9961; // Chromium
+    zZ[8] = 22.0; aA[8] =  47.867 ; // Titanium
+
+    wW[1] = 0.016000;//Cu - mean value
+    wW[2] = 0.005000;//Fe
+    wW[3] = 0.003000;//Mn
+    wW[4] = 0.025000;//Mg - mean value
+    wW[5] = 0.004000;//Si
+    wW[6] = 0.056000;//Zn - mean value
+    wW[7] = 0.002300;//Cr - mean value
+    wW[8] = 0.002000;//Ti
+
+    totFrac = 0;
+    for (Int_t j=1; j<9; j++)
+      totFrac += wW[j];
+    wW[0] = 1. - totFrac;//Al - the remainder
+
+    den = 2.69;
+    AliMixture(33,"ERGAL$",aA,zZ,den,+9,wW);
+    AliMedium(33,"ERGAL$",33,0,ifield,fieldm,tmaxfd,stemax,deemax,epsil,stmin);
     
 }
 
@@ -6148,59 +6178,6 @@ void AliITSv11Hybrid::SetDefaults(){
     }// end if
     return;
 }
-//______________________________________________________________________
-void AliITSv11Hybrid::DrawModule() const{
-    //     Draw a shaded view of the FMD version 10.
-    // Inputs:
-    //   none.
-    // Outputs:
-    //   none.
-    // Return:
-    //   none.
-
-    // Set everything unseen
-    gMC->Gsatt("*", "seen", -1);
-    // 
-    // Set ALIC mother visible
-    gMC->Gsatt("ALIC","SEEN",0);
-    //
-    // Set the volumes visible
-    gMC->Gsatt("ITSD","SEEN",0);
-    gMC->Gsatt("ITS1","SEEN",1);
-    gMC->Gsatt("ITS2","SEEN",1);
-    gMC->Gsatt("ITS3","SEEN",1);
-    gMC->Gsatt("ITS4","SEEN",1);
-    gMC->Gsatt("ITS5","SEEN",1);
-    gMC->Gsatt("ITS6","SEEN",1);
-    //
-    gMC->Gsatt("IPCB","SEEN",1);
-    gMC->Gsatt("ICO2","SEEN",1);
-    gMC->Gsatt("ICER","SEEN",0);
-    gMC->Gsatt("ISI2","SEEN",0);
-    gMC->Gsatt("IPLA","SEEN",0);
-    gMC->Gsatt("ICO3","SEEN",0);
-    gMC->Gsatt("IEPX","SEEN",0);
-    gMC->Gsatt("ISI3","SEEN",1);
-    gMC->Gsatt("ISUP","SEEN",0);
-    gMC->Gsatt("ICHO","SEEN",0);
-    gMC->Gsatt("ICMO","SEEN",0);
-    gMC->Gsatt("ICMD","SEEN",0);
-    gMC->Gsatt("ICCO","SEEN",1);
-    gMC->Gsatt("ICCM","SEEN",0);
-    gMC->Gsatt("ITMD","SEEN",0);
-    gMC->Gsatt("ITTT","SEEN",1);
-    //
-    gMC->Gdopt("hide", "on");
-    gMC->Gdopt("shad", "on");
-    gMC->Gsatt("*", "fill", 7);
-    gMC->SetClipBox(".");
-    gMC->SetClipBox("*", 0, 300, -300, 300, -300, 300);
-    gMC->DefaultRange();
-    gMC->Gdraw("alic", 40, 30, 0, 11, 10, .07, .07);
-    gMC->Gdhead(1111, "Inner Tracking System Version 1");
-    gMC->Gdman(17, 6, "MAN");
-}
-
 //______________________________________________________________________
 void AliITSv11Hybrid::StepManager(){
     //    Called for every step in the ITS, then calles the AliITShit class