Modifications from A.Maevskaya

diff --git a/START/AliSTART.cxx b/START/AliSTART.cxx
index 7ba9e8b7787020ba8a105d94c8b55ab4e57c8e92..2dfa8919a2749d0adc138c92b5e9ea8949394348 100755 (executable)
--- a/START/AliSTART.cxx
+++ b/START/AliSTART.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.3  1999/09/29 09:24:29  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -48,7 +51,6 @@ $Log$
 #include <iostream.h>
 #include <fstream.h>
 #include "AliMC.h"
-//#include "TGeant3.h"
  
 ClassImp(AliSTART)
  
@@ -142,7 +144,6 @@ void AliSTART::Init()
   //
   // Initialis the START after it has been built
   Int_t i;
-  AliMC* pMC = AliMC::GetMC();
   //
   printf("\n");
   for(i=0;i<35;i++) printf("*");
@@ -155,7 +156,7 @@ void AliSTART::Init()
   printf("\n");
  //
  //
- fIdSens1=pMC->VolId("PTOP");
+ fIdSens1=gMC->VolId("PTOP");
 
 }
 

diff --git a/START/AliSTARTv0.cxx b/START/AliSTARTv0.cxx
index 263b08d64dad5e02ecdfe5717d6adcecb7a44d95..a707ede7d33201c8a122d0b357c70d1f34c716c9 100755 (executable)
--- a/START/AliSTARTv0.cxx
+++ b/START/AliSTARTv0.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.5  1999/09/29 09:24:29  fca
+Introduction of the Copyright and cvs Log
+
 */
 
 /////////////////////////////////////////////////////////////////////
@@ -77,7 +80,6 @@ void AliSTARTv0::CreateGeometry()
   Float_t x,y,z;
 
   Float_t pstart[3]={4.5,10.7,5.3};
-  //  Float_t pscin[3]={0.,2.54/2.,1.5};
   Float_t ppmt[3]={0.,1.3,3.5};
   Float_t pdivider[3]={0.,1.2,1.75};
   Float_t pdiv2[3]={0.,1.2,1.25};
@@ -106,7 +108,6 @@ void AliSTARTv0::CreateGeometry()
     gMC->Gspos("STRT",2,"ALIC",0.,0.,-zdet,idrotm[901],"ONLY");
 
 //START interior
-    //    gMC->Gsvolu("SCIN","TUBE",idtmed[2102-1],pscin,3);
     gMC->Gsvolu("PMT ","TUBE",idtmed[2103-1],ppmt,3);     
     gMC->Gsvolu("DIVI","TUBE",idtmed[2103-1],pdivider,3);     
 
@@ -116,11 +117,8 @@ void AliSTARTv0::CreateGeometry()
       x=6.5*TMath::Sin(is*2*3.1415/13);
       y=6.5*TMath::Cos(is*2*3.1415/13);
       z=-pstart[2]+ppmt[2];
-      printf(" is %d x %f y %f r%f\n",is,x,y,sqrt(x*x+y*y));
-      //      gMC->Gspos("SCIN",is,"STRT",x,y,z,0,"ONLY");
-      //      z=z+pscin[2]+ppmt[2];
       gMC->Gspos("PMT ",is,"STRT",x,y,z,0,"ONLY");
-      z=ppmt[2]+pdivider[2];
+      z+=ppmt[2]+pdiv2[2];
       printf(" is %d, z Divider %f\n",is,z);
       gMC->Gspos("DIVI",is,"STRT",x,y,z,0,"ONLY");
     }
@@ -130,10 +128,8 @@ void AliSTARTv0::CreateGeometry()
       x=9.3*TMath::Sin(2.*3.1415/26+(is-13)*2*3.1415/20);
       y=9.3*TMath::Cos(2.*3.1315/26+(is-13)*2*3.1415/20);
       z=-pstart[2]+ppmt[2];
-      //      gMC->Gspos("SCIN",is,"STRT",x,y,z,0,"ONLY");
-      //z=z+pscin[2]+ppmt[2];
       gMC->Gspos("PMT ",is,"STRT",x,y,z,0,"ONLY");
-      z=ppmt[2]+pdiv2[2];
+      z+=ppmt[2]+pdiv2[2];
       gMC->Gspos("DIVI",is,"STRT",x,y,z,0,"ONLY");
     }
 // PMT
@@ -214,10 +210,10 @@ void AliSTARTv0::CreateMaterials()
    Int_t nbuf;
 
 // Scintillator CH
-   //    Float_t ascin[2]={1.01,12.01};
-   // Float_t zscin[2]={1,6};
-   // Float_t wscin[2]={1,1};
-   // Float_t denscin=1.03;
+   Float_t ascin[2]={1.01,12.01};
+   Float_t zscin[2]={1,6};
+   Float_t wscin[2]={1,1};
+   Float_t denscin=1.03;
 // PMT glass SiO2
     Float_t aglass[2]={28.0855,15.9994};
     Float_t zglass[2]={14.,8.};
@@ -243,11 +239,6 @@ void AliSTARTv0::CreateMaterials()
    Float_t denribber=0.8;
  
    
-//   AliMC* gMC = AliMC::GetMC();
-
- //  Int_t *idtmed = gAlice->Idtmed();
- //  Int_t imat;
-
 //*** Definition Of avaible START materials ***
  AliMaterial(0, "START Steel$", 55.850,26.,7.87,1.76,999);
  AliMaterial(1, "START Vacuum$", 1.e-16,1.e-16,1.e-16,1.e16,999);
@@ -264,7 +255,7 @@ void AliSTARTv0::CreateMaterials()
   zcer[1]=z;
   
  AliMixture( 9, "Ceramic    $", acer, zcer, denscer, 2, wcer);
- // AliMixture( 5, "Scintillator$",ascin,zscin,denscin,-2,wscin);
+ AliMixture( 5, "Scintillator$",ascin,zscin,denscin,-2,wscin);
  AliMixture( 6, "Brass    $", abrass, zbrass, denbrass, 2, wbrass);
 
  AliMixture( 7, "Ribber $",aribber,zribber,denribber,-3,wribber);
@@ -273,7 +264,7 @@ void AliSTARTv0::CreateMaterials()
 
 //**
  AliMedium(1, "START Air$", 2, 0, ISXFLD, SXMGMX, 10., .1, 1., .003, .003);
- // AliMedium(2102, "Scintillator$", 5, 1, ISXFLD, SXMGMX, 10., .01, 1., .003, .003);
+ AliMedium(2, "Scintillator$", 5, 1, ISXFLD, SXMGMX, 10., .01, 1., .003, .003);
  AliMedium(3, "Vacuum$", 1, 0, ISXFLD, SXMGMX, 10., .01, .1, .003, .003);
  AliMedium(4, "Ceramic$", 9, 0, ISXFLD, SXMGMX, 10., .01, .1, .003, .003);
  AliMedium(6, "Glass$", 4, 0, ISXFLD, SXMGMX, 10., .01, .1, .003, .003);
@@ -295,7 +286,6 @@ gMC->Gsatt("ALIC","SEEN",0);
 //
 //Set volumes visible
 gMC->Gsatt("STRT","SEEN",0);
-//gMC->Gsatt("SCIN","SEEN",1);
 gMC->Gsatt("PMT ","SEEN",1);
 gMC->Gsatt("DIVI","SEEN",1);
 //
@@ -367,14 +357,6 @@ void AliSTARTv0::StepManager()
        Float_t ttime=gMC->TrackTime();
        hits[6]=ttime*1e9;
        edep=0;
-       //       Float_t xV=geant3->Gckine()->vert[0];
-       //Float_t yV=geant3->Gckine()->vert[1];
-       //Float_t zV=geant3->Gckine()->vert[2];
-       //Float_t tl=gMC -> TrackLength();
-       //      if(hits[6]<2.4){     
-       //          for (i=0; i<=6; i++){
-       //          printf(" HITS on START entr %f\n",hits[i]);} 
-       //}
      }
      if(gMC->IsTrackInside())
      {
@@ -397,7 +379,6 @@ void AliSTARTv0::StepManager()
     }
 //---------------------------------------------------------------------
     }
- //}
 
 
 

diff --git a/START/DrawSTART.C b/START/DrawSTART.C
index d52e37d94c4555389297942c2e76d2c14fa6272a..a3ba444dfb63881ea2d49aeb58fa3615715d34a1 100755 (executable)
--- a/START/DrawSTART.C
+++ b/START/DrawSTART.C
@@ -1,15 +1,15 @@
 //void DrawSTART()
 {
-   geant3->Gsatt("*", "seen", -1);
-   geant3->Gsatt("alic", "seen", 0);
+   gMC->Gsatt("*", "seen", -1);
+   gMC->Gsatt("alic", "seen", 0);
    gROOT->Macro("ViewSTART.C");
-   geant3->Gdopt("hide", "on");
-   geant3->Gdopt("shad", "on");
-   geant3->Gsatt("*", "fill", 7);
-   geant3->SetClipBox(".");
-   geant3->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
-   geant3->DefaultRange();
-   geant3->Gdraw("alic", 40, 30, 0, 6, 9, .08, .08);
-   geant3->Gdhead(1111, "START Detector");
-   geant3->Gdman(13, 9, "MAN");
+   gMC->Gdopt("hide", "on");
+   gMC->Gdopt("shad", "on");
+   gMC->Gsatt("*", "fill", 7);
+   gMC->SetClipBox(".");
+   //  gMC->SetClipBox("*", 0, 1000, -1000, 1000, -1000, 1000);
+   gMC->DefaultRange();
+   gMC->Gdraw("alic", 40, 30, 0, 6, 9, .08, .08);
+   gMC->Gdhead(1111, "START Detector");
+   gMC->Gdman(13, 9, "MAN");
 }

diff --git a/START/ViewSTART.C b/START/ViewSTART.C
index 45ec63ca72ae0cf326a07353f392ca8aa6afcb13..1842b29e1aeb3be2083a7eb22bde10c915eeed05 100755 (executable)
--- a/START/ViewSTART.C
+++ b/START/ViewSTART.C
@@ -1,9 +1,8 @@
 //void ViewSTART()
 {
-   geant3->Gsatt("STRT","seen",0);
-   geant3->Gsatt("SCIN","seen",1);
-   geant3->Gsatt("PMT ","seen",1);
-   geant3->Gsatt("DIVI","seen",1);
+   gMC->Gsatt("STRT","seen",0);
+   gMC->Gsatt("PMT ","seen",1);
+   gMC->Gsatt("DIVI","seen",1);
 }