]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - T0/AliT0v1.cxx
Fixes for memory leaks (Chiara)
[u/mrichter/AliRoot.git] / T0 / AliT0v1.cxx
index fe10a622a057ffbc19d8da7303b30350d264fb00..3adca935fc379a6d08d672f6c88759d2b2178cfd 100644 (file)
@@ -218,31 +218,31 @@ void AliT0v1::CreateGeometry()
     ppcon[41] =  7.6;
 
 
-    gMC->Gsvolu("0SUP", "PCON", idtmed[kAir], ppcon,42);
+    TVirtualMC::GetMC()->Gsvolu("0SUP", "PCON", idtmed[kAir], ppcon,42);
     z = -zdetC;
-    gMC->Gspos("0SUP",1,"ALIC",0.,0.,z,idrotm[901],"ONLY");
+    TVirtualMC::GetMC()->Gspos("0SUP",1,"ALIC",0.,0.,z,idrotm[901],"ONLY");
    
 //-------------------------------------------------------------------
  //  T0 volume 
  //-------------------------------------------------------------------
   
     
-    gMC->Gsvolu("0STR","PCON",idtmed[kAir],pstartR,18);
-    gMC->Gspos("0STR",1,"ALIC",0.,0.,-zdetC+pstartR[3],idrotm[901],"ONLY");
-    // gMC->Gspos("0STL",1,"ALIC",0.,0.,zdetA+pstart[2],0,"ONLY");
+    TVirtualMC::GetMC()->Gsvolu("0STR","PCON",idtmed[kAir],pstartR,18);
+    TVirtualMC::GetMC()->Gspos("0STR",1,"ALIC",0.,0.,-zdetC+pstartR[3],idrotm[901],"ONLY");
+    // TVirtualMC::GetMC()->Gspos("0STL",1,"ALIC",0.,0.,zdetA+pstart[2],0,"ONLY");
 
 //T0 interior
-   gMC->Gsvolu("0INS","TUBE",idtmed[kAir],pinstart,3);
-   gMC->Gsvolu("0PMT","TUBE",idtmed[kAir],ppmt,3);     
+   TVirtualMC::GetMC()->Gsvolu("0INS","TUBE",idtmed[kAir],pinstart,3);
+   TVirtualMC::GetMC()->Gsvolu("0PMT","TUBE",idtmed[kAir],ppmt,3);     
           
-    gMC->Gsvolu("0SU1","TUBE",idtmed[kC],psupport1,3);//C kozhuh vnutri
-    gMC->Gsvolu("0SU2","TUBE",idtmed[kC],psupport2,3);// snaruzhi  C
-    gMC->Gsvolu("0SU3","TUBE",idtmed[kC],psupport3,3);//kryshka perednaiai  C
-    gMC->Gsvolu("0SU4","TUBE",idtmed[kC],psupport3,3);//kryshka zadnaiai  C
-    //    gMC->Gsvolu("0SU5","TUBE",idtmed[kAir],psupport4,3);// dyrki dlia feu v zadnej kryshke Air
-    gMC->Gsvolu("0SU6","TUBE",idtmed[kC],psupport5,3);// stakanchik dlai feu  C
-    gMC->Gsvolu("0SU7","TUBE",idtmed[kAl],psupport6,3);//kryshechka stakanchika  Al
-    gMC->Gsvolu("0SU8","TUBE",idtmed[kAl],psupport7,3);//kolechko snaruzhu stakanchika Al
+    TVirtualMC::GetMC()->Gsvolu("0SU1","TUBE",idtmed[kC],psupport1,3);//C kozhuh vnutri
+    TVirtualMC::GetMC()->Gsvolu("0SU2","TUBE",idtmed[kC],psupport2,3);// snaruzhi  C
+    TVirtualMC::GetMC()->Gsvolu("0SU3","TUBE",idtmed[kC],psupport3,3);//kryshka perednaiai  C
+    TVirtualMC::GetMC()->Gsvolu("0SU4","TUBE",idtmed[kC],psupport3,3);//kryshka zadnaiai  C
+    //    TVirtualMC::GetMC()->Gsvolu("0SU5","TUBE",idtmed[kAir],psupport4,3);// dyrki dlia feu v zadnej kryshke Air
+    TVirtualMC::GetMC()->Gsvolu("0SU6","TUBE",idtmed[kC],psupport5,3);// stakanchik dlai feu  C
+    TVirtualMC::GetMC()->Gsvolu("0SU7","TUBE",idtmed[kAl],psupport6,3);//kryshechka stakanchika  Al
+    TVirtualMC::GetMC()->Gsvolu("0SU8","TUBE",idtmed[kAl],psupport7,3);//kolechko snaruzhu stakanchika Al
    
  
 
@@ -304,112 +304,112 @@ void AliT0v1::CreateGeometry()
                   90. + theta, phi[1],
                   theta,       phi[2]);  
        z=-pstart[2]+pinstart[2]+0.3;
-       gMC->Gspos ("0INS", is + 1, "0STR", x, y, z, idrotm[902 + is], "ONLY");
+       TVirtualMC::GetMC()->Gspos ("0INS", is + 1, "0STR", x, y, z, idrotm[902 + is], "ONLY");
   }    
      
    x=0;
    y=0;
    //   z=-pinstart[2]+ppmt[2]+psupport6[2]*2;
    z=-pinstart[2]+ppmt[2]+0.08; //+psupport6[2];
-   gMC->Gspos("0PMT",1,"0INS",x,y,z,0,"ONLY");
+   TVirtualMC::GetMC()->Gspos("0PMT",1,"0INS",x,y,z,0,"ONLY");
    // PMT
    
    // Entry window (glass)
-   gMC->Gsvolu("0TOP","TUBE",idtmed[kOpGlass],ptop,3); //glass
+   TVirtualMC::GetMC()->Gsvolu("0TOP","TUBE",idtmed[kOpGlass],ptop,3); //glass
    z=-ppmt[2]+ptop[2];
-   gMC->Gspos("0TOP",1,"0PMT",0,0,z,0,"ONLY");
+   TVirtualMC::GetMC()->Gspos("0TOP",1,"0PMT",0,0,z,0,"ONLY");
    //"metal" air volume to simulate reclection  
-   gMC->Gsvolu("0TOO","TUBE",idtmed[kOpAir],ptopout,3); 
-   gMC->Gspos("0TOO",1,"0PMT",0,0,z,0,"ONLY");
+   TVirtualMC::GetMC()->Gsvolu("0TOO","TUBE",idtmed[kOpAir],ptopout,3); 
+   TVirtualMC::GetMC()->Gspos("0TOO",1,"0PMT",0,0,z,0,"ONLY");
 
    //Fotokatod
-   gMC->Gsvolu ("0REG", "TUBE", idtmed[kOpGlassCathode], preg, 3); 
+   TVirtualMC::GetMC()->Gsvolu ("0REG", "TUBE", idtmed[kOpGlassCathode], preg, 3); 
    z = -ppmt[2] + 2 * ptop[2] + preg[2]; 
-   gMC->Gspos ("0REG", 1, "0PMT", 0, 0, z, 0, "ONLY"); 
+   TVirtualMC::GetMC()->Gspos ("0REG", 1, "0PMT", 0, 0, z, 0, "ONLY"); 
   // Bottom glass
-   gMC->Gsvolu("0BOT","TUBE",idtmed[kGlass],pbot,3);
+   TVirtualMC::GetMC()->Gsvolu("0BOT","TUBE",idtmed[kGlass],pbot,3);
    z=ppmt[2]-pbot[2];
-   gMC->Gspos("0BOT",1,"0PMT",0,0,z,0,"ONLY");
+   TVirtualMC::GetMC()->Gspos("0BOT",1,"0PMT",0,0,z,0,"ONLY");
    // Side cylinder glass
-   gMC->Gsvolu("0OUT","TUBE",idtmed[kGlass],pglass,3);
+   TVirtualMC::GetMC()->Gsvolu("0OUT","TUBE",idtmed[kGlass],pglass,3);
    z=ppmt[2]-pglass[2];
-   gMC->Gspos("0OUT",1,"0PMT",0,0,z,0,"ONLY");
+   TVirtualMC::GetMC()->Gspos("0OUT",1,"0PMT",0,0,z,0,"ONLY");
    //PMT electrodes support structure
-   gMC->Gsvolu("0CER","TUBE",idtmed[kCer],pcer,3);
-   gMC->Gsvolu("0STE","TUBE",idtmed[kSteel],psteel,3);
+   TVirtualMC::GetMC()->Gsvolu("0CER","TUBE",idtmed[kCer],pcer,3);
+   TVirtualMC::GetMC()->Gsvolu("0STE","TUBE",idtmed[kSteel],psteel,3);
    z=-ppmt[2]+2*ptop[2]+0.3 + pcer[2];
-   gMC->Gspos("0CER",1,"0PMT",0,0,z,0,"ONLY");
+   TVirtualMC::GetMC()->Gspos("0CER",1,"0PMT",0,0,z,0,"ONLY");
    z +=psteel[2]+pcer[2];
-   gMC->Gspos("0STE",1,"0PMT",0,0,z,0,"ONLY");
+   TVirtualMC::GetMC()->Gspos("0STE",1,"0PMT",0,0,z,0,"ONLY");
     
    //Support absorber (C) side
    z=-pstart[2]+psupport1[2];//  0.05; //0.1;
-   gMC->Gspos("0SU1",1,"0STR",0,0,z,0,"ONLY"); //C kozhuh snaruzhi
-   gMC->Gspos("0SU2",1,"0STR",0,0,z,0,"ONLY"); //C kozhuh vnutri
+   TVirtualMC::GetMC()->Gspos("0SU1",1,"0STR",0,0,z,0,"ONLY"); //C kozhuh snaruzhi
+   TVirtualMC::GetMC()->Gspos("0SU2",1,"0STR",0,0,z,0,"ONLY"); //C kozhuh vnutri
    z=-pstart[2]+psupport3[2];//  - 0.1;
-   gMC->Gspos("0SU3",1,"0STR",0,0,z,0,"ONLY"); //peredniaia kryshka
+   TVirtualMC::GetMC()->Gspos("0SU3",1,"0STR",0,0,z,0,"ONLY"); //peredniaia kryshka
    z=-pstart[2]+2.*psupport1[2];//+0.1;
-   gMC->Gspos("0SU4",1,"0STR",0,0,z,0,"MANY"); //zadnaiai kryshka
-   gMC->Gspos("0SU6",1,"0INS",0,0,0,0,"ONLY");//C stakanchik dlia feu 
+   TVirtualMC::GetMC()->Gspos("0SU4",1,"0STR",0,0,z,0,"MANY"); //zadnaiai kryshka
+   TVirtualMC::GetMC()->Gspos("0SU6",1,"0INS",0,0,0,0,"ONLY");//C stakanchik dlia feu 
    z=-pinstart[2]+psupport6[2]; //-0.1;
-   gMC->Gspos("0SU7",1,"0INS",0,0,z,0,"ONLY"); //Al kryshechka 
+   TVirtualMC::GetMC()->Gspos("0SU7",1,"0INS",0,0,z,0,"ONLY"); //Al kryshechka 
    
    z=pinstart[2]-psupport7[2];
-   //  gMC->Gspos("0SU8",1,"0SU6",0,0,z,0,"ONLY"); //Al kolechko
+   //  TVirtualMC::GetMC()->Gspos("0SU8",1,"0SU6",0,0,z,0,"ONLY"); //Al kolechko
    
    
    Float_t par[3];
    par[0]=4.4;
    par[1]=4.5;
    par[2]=0.5;
-   gMC->Gsvolu("0SC0","TUBE",idtmed[kC],par,3);
+   TVirtualMC::GetMC()->Gsvolu("0SC0","TUBE",idtmed[kC],par,3);
    z=ppcon[3]+par[2];
-   gMC->Gspos("0SC0",1,"0SUP",0,0,z,0,"ONLY"); 
+   TVirtualMC::GetMC()->Gspos("0SC0",1,"0SUP",0,0,z,0,"ONLY"); 
    z += par[2];
    par[0]=4.4;
    par[1]=5.1;
    par[2]=0.05;
-   gMC->Gsvolu("0SC1","TUBE",idtmed[kC],par,3);
+   TVirtualMC::GetMC()->Gsvolu("0SC1","TUBE",idtmed[kC],par,3);
    z += par[2];
-   gMC->Gspos("0SC1",1,"0SUP",0,0,z,0,"ONLY"); 
+   TVirtualMC::GetMC()->Gspos("0SC1",1,"0SUP",0,0,z,0,"ONLY"); 
    z=z+par[2];
    par[0]=4.9;
    par[1]=5.0;
    par[2]=6.7/2;
-    gMC->Gsvolu("0SC2","TUBE",idtmed[kC],par,3);
+    TVirtualMC::GetMC()->Gsvolu("0SC2","TUBE",idtmed[kC],par,3);
     z += par[2];
-    gMC->Gspos("0SC2",1,"0SUP",0,0,z,0,"ONLY"); 
+    TVirtualMC::GetMC()->Gspos("0SC2",1,"0SUP",0,0,z,0,"ONLY"); 
     z += par[2];
    
     par[0]=3.15;
     par[1]=4.9;
     par[2]=0.01/2;
 
-    gMC->Gsvolu("0SA1","TUBE",idtmed[kAl],par,3);
+    TVirtualMC::GetMC()->Gsvolu("0SA1","TUBE",idtmed[kAl],par,3);
     
      z += par[2];
      //  z -= par[2];
-    gMC->Gspos("0SA1",1,"0SUP",0,0,z,0,"ONLY"); 
+    TVirtualMC::GetMC()->Gspos("0SA1",1,"0SUP",0,0,z,0,"ONLY"); 
     z=z+par[2];
     par[0]=3.15;
     par[1]=3.16;
     par[2]=4.7/2;
-    gMC->Gsvolu("0SA2","TUBE",idtmed[kAl],par,3);
+    TVirtualMC::GetMC()->Gsvolu("0SA2","TUBE",idtmed[kAl],par,3);
     z += par[2];
-    gMC->Gspos("0SA2",1,"0SUP",0,0,z,0,"ONLY"); 
+    TVirtualMC::GetMC()->Gspos("0SA2",1,"0SUP",0,0,z,0,"ONLY"); 
     z=z+par[2];
     par[0]=3.16; // eta chast' prikruchena k absorberu
     par[1]=7.4;
     par[2]=0.01;
-    gMC->Gsvolu("0SA3","TUBE",idtmed[kAl],par,3);
+    TVirtualMC::GetMC()->Gsvolu("0SA3","TUBE",idtmed[kAl],par,3);
     //   z += par[2];
    z = ppcon[39] - par[2];
-    gMC->Gspos("0SA3",1,"0SUP",0,0,z,0,"ONLY"); 
+    TVirtualMC::GetMC()->Gspos("0SA3",1,"0SUP",0,0,z,0,"ONLY"); 
     par[0]=3.16; // gvozdi eta chast' prikruchena k absorberu
     par[1]=7.4;
     par[2]=0.01;
-    gMC->Gsvolu("0SN2","TUBE",idtmed[kSteel],par,3);
-    gMC->Gspos("0SN2",1,"0SUP",0,0,z,0,"MANY"); 
+    TVirtualMC::GetMC()->Gsvolu("0SN2","TUBE",idtmed[kSteel],par,3);
+    TVirtualMC::GetMC()->Gspos("0SN2",1,"0SUP",0,0,z,0,"MANY"); 
  
    
 
@@ -533,11 +533,11 @@ void AliT0v1::CreateMaterials()
    /* 
   char namate[21]="";
   
-   gMC->Gfmate((*fIdmate)[3], namate, a, z, d, radl, absl, buf, nbuf);
+   TVirtualMC::GetMC()->Gfmate((*fIdmate)[3], namate, a, z, d, radl, absl, buf, nbuf);
    acer[0]=a;  
 
    zcer[0]=z;
-   gMC->Gfmate((*fIdmate)[4], namate, a, z, d, radl, absl, buf, nbuf);
+   TVirtualMC::GetMC()->Gfmate((*fIdmate)[4], namate, a, z, d, radl, absl, buf, nbuf);
    acer[1]=a;
    zcer[1]=z;
    AliMixture( 11, "Ceramic    $", acer, zcer, denscer, 2, wcer);
@@ -634,17 +634,17 @@ void AliT0v1::DefineOpticalProperties()
 
     }
   
-  gMC->SetCerenkov (idtmed[kOpGlass], kNbins, aPckov, aAbsSiO2, efficAll, rindexSiO2 );
-   // gMC->SetCerenkov (idtmed[kOpGlassCathode], kNbins, aPckov, aAbsSiO2, effCathode, rindexSiO2 );
-   gMC->SetCerenkov (idtmed[kOpGlassCathode], kNbins, aPckov, aAbsSiO2,efficAll , rindexSiO2 );
-  gMC->SetCerenkov (idtmed[kOpAir], kNbins, aPckov,absorAir , efficAll,rindexAir );
-   gMC->SetCerenkov (idtmed[kOpAirNext], kNbins, aPckov,absorbCathodeNext , efficAll, rindexCathodeNext);
+  TVirtualMC::GetMC()->SetCerenkov (idtmed[kOpGlass], kNbins, aPckov, aAbsSiO2, efficAll, rindexSiO2 );
+   // TVirtualMC::GetMC()->SetCerenkov (idtmed[kOpGlassCathode], kNbins, aPckov, aAbsSiO2, effCathode, rindexSiO2 );
+   TVirtualMC::GetMC()->SetCerenkov (idtmed[kOpGlassCathode], kNbins, aPckov, aAbsSiO2,efficAll , rindexSiO2 );
+  TVirtualMC::GetMC()->SetCerenkov (idtmed[kOpAir], kNbins, aPckov,absorAir , efficAll,rindexAir );
+   TVirtualMC::GetMC()->SetCerenkov (idtmed[kOpAirNext], kNbins, aPckov,absorbCathodeNext , efficAll, rindexCathodeNext);
 
    //Define a boarder for radiator optical properties
-   gMC->DefineOpSurface("surfRd", kUnified /*kGlisur*/,kDielectric_metal,kPolished, 0.);
-   gMC->SetMaterialProperty("surfRd", "EFFICIENCY", kNbins, dPckov, efficMet);
-   gMC->SetMaterialProperty("surfRd", "REFLECTIVITY", kNbins, dPckov, aReflMet);
-   gMC->SetBorderSurface("0TOPborder", "0TOP",1,"0TOO",1, "surfRd");
+   TVirtualMC::GetMC()->DefineOpSurface("surfRd", kUnified /*kGlisur*/,kDielectric_metal,kPolished, 0.);
+   TVirtualMC::GetMC()->SetMaterialProperty("surfRd", "EFFICIENCY", kNbins, dPckov, efficMet);
+   TVirtualMC::GetMC()->SetMaterialProperty("surfRd", "REFLECTIVITY", kNbins, dPckov, aReflMet);
+   TVirtualMC::GetMC()->SetBorderSurface("0TOPborder", "0TOP",1,"0TOO",1, "surfRd");
 
 
 }
@@ -655,7 +655,7 @@ void AliT0v1::Init()
 // Initialises version 0 of the Forward Multiplicity Detector
 //
   AliT0::Init();
-  fIdSens1=gMC->VolId("0REG");
+  fIdSens1=TVirtualMC::GetMC()->VolId("0REG");
 
    AliDebug(1,Form("%s: *** T0 version 1 initialized ***\n",ClassName()));
 }
@@ -675,32 +675,32 @@ void AliT0v1::StepManager()
   
   //   TClonesArray &lhits = *fHits;
   
-  if(!gMC->IsTrackAlive()) return; // particle has disappeared
+  if(!TVirtualMC::GetMC()->IsTrackAlive()) return; // particle has disappeared
   
-  id=gMC->CurrentVolID(copy);
+  id=TVirtualMC::GetMC()->CurrentVolID(copy);
   
   // Check the sensetive volume
   if(id==fIdSens1 ) { 
-    if(gMC->IsTrackEntering()) {
-      gMC->CurrentVolOffID(2,copy);
+    if(TVirtualMC::GetMC()->IsTrackEntering()) {
+      TVirtualMC::GetMC()->CurrentVolOffID(2,copy);
       vol[1]=copy;
-      gMC->CurrentVolOffID(3,copy1);
+      TVirtualMC::GetMC()->CurrentVolOffID(3,copy1);
       vol[0]=copy1;
-      gMC->TrackPosition(pos);
+      TVirtualMC::GetMC()->TrackPosition(pos);
       hits[0] = pos[0];
       hits[1] = pos[1];
       hits[2] = pos[2];
       if(pos[2]<0) vol[0] = 2;
       if(pos[2]>=0) vol[0] = 1; 
       
-      Float_t etot=gMC->Etot();
+      Float_t etot=TVirtualMC::GetMC()->Etot();
       hits[3]=etot;
-      Int_t iPart= gMC->TrackPid();
-      Int_t partID=gMC->IdFromPDG(iPart);
+      Int_t iPart= TVirtualMC::GetMC()->TrackPid();
+      Int_t partID=TVirtualMC::GetMC()->IdFromPDG(iPart);
       hits[4]=partID;
-      Float_t ttime=gMC->TrackTime();
+      Float_t ttime=TVirtualMC::GetMC()->TrackTime();
       hits[5]=ttime*1e12;
-      if (gMC->TrackPid() == 50000050)   // If particles is photon then ...
+      if (TVirtualMC::GetMC()->TrackPid() == 50000050)   // If particles is photon then ...
        {
          if(RegisterPhotoE(vol[1]-1,hits[3])) {
            AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(),vol,hits);
@@ -709,20 +709,20 @@ void AliT0v1::StepManager()
        }
 
       //charge particle 
-      if ( gMC->TrackCharge() )
+      if ( TVirtualMC::GetMC()->TrackCharge() )
        AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kT0);
       
        /*              
                printf("track(%i) alive(%i) disap(%i) enter(%i) exit(%i) inside(%i) out(%i) stop(%i) new(%i) \n",
                       gAlice->GetMCApp()->GetCurrentTrackNumber(),
-              gMC->IsTrackAlive(),
-              gMC->IsTrackDisappeared(),
-              gMC->IsTrackEntering(),
-              gMC->IsTrackExiting(),
-              gMC->IsTrackInside(),
-              gMC->IsTrackOut(),
-              gMC->IsTrackStop(),
-              gMC->IsNewTrack());
+              TVirtualMC::GetMC()->IsTrackAlive(),
+              TVirtualMC::GetMC()->IsTrackDisappeared(),
+              TVirtualMC::GetMC()->IsTrackEntering(),
+              TVirtualMC::GetMC()->IsTrackExiting(),
+              TVirtualMC::GetMC()->IsTrackInside(),
+              TVirtualMC::GetMC()->IsTrackOut(),
+              TVirtualMC::GetMC()->IsTrackStop(),
+              TVirtualMC::GetMC()->IsNewTrack());
        */
     }// trck entering          
   } //sensitive