Asimmetric START geometry

diff --git a/START/AliSTART.cxx b/START/AliSTART.cxx
index 45172e2317192226a5668fa8497ec505f63d5c65..4d4945196999c65af6235c1db2815f549b68036f 100755 (executable)
--- a/START/AliSTART.cxx
+++ b/START/AliSTART.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.22  2001/07/27 13:03:12  hristov
+Default Branch split level set to 99
+
 Revision 1.21  2001/06/27 16:06:59  hristov
 Rotation matrix in BuildGeometry has been changed to rotx999
 
@@ -191,13 +194,13 @@ void AliSTART::BuildGeometry()
 
   new TTUBE("S_0ST1","START  volume 1","void",5.,10.7,5.3);
   top->cd();
-  node = new TNode("0ST1","0ST01","S_0ST1",0,0,75.,"");
+  node = new TNode("0ST1","0ST01","S_0ST1",0,0,69.7,"");
   node->SetLineColor(kColorSTART);
   fNodes->Add(node);
 
   new TTUBE("S_0ST2","START volume 2","void",5.,10.7,5.3);
   top->cd();
-  node = new TNode("0ST2","0ST2","S_0ST2",0,0,-75,"rotx999");
+  node = new TNode("0ST2","0ST2","S_0ST2",0,0,-350,"rotx999");
   node->SetLineColor(kColorSTART);
   fNodes->Add(node);
 }

diff --git a/START/AliSTARTv0.cxx b/START/AliSTARTv0.cxx
index 1b37782ee7300a8fe343f670a8c7a232f10e04f7..19a7e77bf0ff5232b1282a5353eab02e80bc2d6b 100755 (executable)
--- a/START/AliSTARTv0.cxx
+++ b/START/AliSTARTv0.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.12  2001/04/25 14:09:34  alla
+Curent bur fixed
+
 Revision 1.11  2001/04/04 12:10:18  alla
 changes according Coding Convension
 
@@ -95,12 +98,13 @@ void AliSTARTv0::CreateGeometry()
 
 
   Int_t *idtmed = fIdtmed->GetArray();
-  
+
   Int_t is;
   Int_t idrotm[999];
   Float_t x,y,z;
 
   Float_t pstart[3]={4.5,10.7,5.3};
+  Float_t pinstart[3]={0.,1.3,5.25};
   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};
@@ -118,17 +122,23 @@ void AliSTARTv0::CreateGeometry()
   Float_t pribber[3] = {0.,1.2,2.413/2.};
   Float_t presist[3] = {0.,1.2,0.087/2.};
 
-  Float_t zdet=75.;
+  Float_t zdetRight=69.7,zdetLeft=350;
  //-------------------------------------------------------------------
  //  START volume 
  //-------------------------------------------------------------------
   
+  //  Float_t theta=TMath::ATan(6.5/zdet);
+  Float_t thetaRight=(180./3.1415)*TMath::ATan(6.5/zdetRight);
+  Float_t thetaLeft=(180./3.1415)*TMath::ATan(6.5/zdetLeft);
     AliMatrix(idrotm[901], 90., 0., 90., 90., 180., 0.);
-    gMC->Gsvolu("0STA","TUBE",idtmed[1],pstart,3);
-    gMC->Gspos("0STA",1,"ALIC",0.,0.,zdet,0,"ONLY");
-    gMC->Gspos("0STA",2,"ALIC",0.,0.,-zdet,idrotm[901],"ONLY");
+    
+    gMC->Gsvolu("0STR","TUBE",idtmed[1],pstart,3);
+    gMC->Gsvolu("0STL","TUBE",idtmed[1],pstart,3);
+    gMC->Gspos("0STR",1,"ALIC",0.,0.,zdetRight+pstart[2],0,"ONLY");
+    gMC->Gspos("0STL",1,"ALIC",0.,0.,-zdetLeft-pstart[2],idrotm[901],"ONLY");
 
 //START interior
+    gMC->Gsvolu("0INS","TUBE",idtmed[1],pinstart,3);
     gMC->Gsvolu("0PMT","TUBE",idtmed[3],ppmt,3);     
     gMC->Gsvolu("0DIV","TUBE",idtmed[3],pdivider,3);     
 
@@ -136,15 +146,37 @@ void AliSTARTv0::CreateGeometry()
     Double_t dang1 = 2*TMath::Pi()/12;
     for (is=1; is<=12; is++)
       {  
+       AliMatrix(idrotm[901+is], 
+                 90.-thetaRight, 30.*is, 
+                 90.,       90.+30.*is,
+                 thetaRight,    180.+30.*is); 
        x=6.5*TMath::Sin(is*dang1);
        y=6.5*TMath::Cos(is*dang1);
-       z=-pstart[2]+ppmt[2];
-       gMC->Gspos("0PMT",is,"0STA",x,y,z,0,"ONLY");
-       printf("z PMT %f\n",z);
-       z=z+ppmt[2]+pdiv2[2];
-       printf(" is %d, z Divider %f\n",is,z);
-       gMC->Gspos("0DIV",is,"0STA",x,y,z,0,"ONLY");
+       z=-pstart[2]+pinstart[2];
+       gMC->Gspos("0INS",is,"0STR",x,y,z,idrotm[901+is],"ONLY");
+
+      }        
+    for (is=1; is<=12; is++)
+      {
+        AliMatrix(idrotm[901+is],
+                  90.-thetaLeft, 30.*is,
+                  90.,       90.+30.*is,
+                  thetaLeft,    180.+30.*is);
+
+        x=6.5*TMath::Sin(is*dang1);
+        y=6.5*TMath::Cos(is*dang1);
+        z=-pstart[2]+pinstart[2];
+        gMC->Gspos("0INS",is,"0STL",x,y,z,idrotm[901+is],"ONLY");
+
       }
+     x=0;
+    y=0;
+    z=-pinstart[2]+ppmt[2];
+    if(fDebug) printf("%s: is %d, z Divider %f\n",ClassName(),is,z);
+    gMC->Gspos("0PMT",1,"0INS",x,y,z,0,"ONLY");
+    z=pinstart[2]-pdivider[2];
+    gMC->Gspos("0DIV",1,"0INS",x,y,z,0,"ONLY");
+      
      /*  
 //second ring: 20 units of Scintillator+PMT+divider
       Double_t dang2 = 2*TMath::Pi()/26;
@@ -154,63 +186,65 @@ void AliSTARTv0::CreateGeometry()
      x=9.3*TMath::Sin(dang2+(is-13)*dang3);
      y=9.3*TMath::Cos(dang2+(is-13)*dang3);
       z=-pstart[2]+ppmt[2];
-      gMC->Gspos("0PMT",is,"0ST",x,y,z,0,"ONLY");
+      gMC->Gspos("0PMT",is,"0STA",x,y,z,0,"ONLY");
       z=z+ppmt[2]+pdiv2[2];
-      gMC->Gspos("0DI",is,"0ST",x,y,z,0,"ONLY");
+      gMC->Gspos("0DIV",is,"0STA",x,y,z,0,"ONLY");
       }
      */
 // PMT
       
     // Entry window (glass)
-    gMC->Gsvolu("0TOP","TUBE",idtmed[6],ptop,3);
-    z=-ppmt[2]+ptop[2];
+    // gMC->Gsvolu("0TOP","TUBE",idtmed[6],ptop,3);
+       gMC->Gsvolu("0TOP","TUBE",idtmed[12],ptop,3); //lucite
+     z=-ppmt[2]+ptop[2];
     gMC->Gspos("0TOP",1,"0PMT",0,0,z,0,"ONLY");
     //     printf("Z PTOP %f -ppmt[2] %f ptop[2] %f\n",z,-ppmt[2],ptop[2]);
+    
     // Bottom glass
-    gMC->Gsvolu("0BO","TUBE",idtmed[6],pbot,3);
+    gMC->Gsvolu("0BOT","TUBE",idtmed[6],pbot,3);
     z=ppmt[2]-pbot[2];
-    printf("Z bottom %f\n",z);
-    gMC->Gspos("0BO",1,"0PMT",0,0,z,0,"ONLY");
+    if(fDebug) printf("%s: Z bottom %f\n",ClassName(),z);
+    gMC->Gspos("0BOT",1,"0PMT",0,0,z,0,"ONLY");
     // Side cylinder glass
-    gMC->Gsvolu("0UO","TUBE",idtmed[6],pglass,3);
+    gMC->Gsvolu("0OUT","TUBE",idtmed[6],pglass,3);
     z=ppmt[2]-pglass[2];
     //      printf("Z glass %f\n",z);
-    gMC->Gspos("0UO",1,"0PMT",0,0,z,0,"ONLY");
+    gMC->Gspos("0OUT",1,"0PMT",0,0,z,0,"ONLY");
     //PMT electrodes support structure
-    gMC->Gsvolu("0CE","TUBE",idtmed[4],pcer,3);
-    gMC->Gsvolu("0IR","TUBE",idtmed[8],psteel,3);
+    gMC->Gsvolu("0CER","TUBE",idtmed[4],pcer,3);
+    gMC->Gsvolu("0STE","TUBE",idtmed[8],psteel,3);
     z=-ppmt[2]+2*ptop[2]+0.3;;
     //      printf("Z Cer 1 %f\n",z);
     for (is=1; is<=15; is++)
       {
        z=z+psteel[2]+pcer[2];
-       gMC->Gspos("0CE",is,"0PMT",0,0,z,0,"ONLY");
+       gMC->Gspos("0CER",is,"0PMT",0,0,z,0,"ONLY");
        z=z+psteel[2]+pcer[2];
-       gMC->Gspos("0IR",is,"0PMT",0,0,z,0,"ONLY");
+       gMC->Gspos("0STE",is,"0PMT",0,0,z,0,"ONLY");
       }
     
     // Divider
     // Knob at the bottom of PMT baloon
     
-    gMC->Gsvolu("0OB","TUBE",idtmed[6],pknob,3);
+    gMC->Gsvolu("0NB","TUBE",idtmed[6],pknob,3);
     z=-pdivider[2]+pknob[2];
     //      printf("zknob %f\n",z);
-    gMC->Gspos("0OB",1,"0DIV",0,0,z,0,"ONLY");
+    gMC->Gspos("0NB",1,"0DIV",0,0,z,0,"ONLY");
     gMC->Gsvolu("0KB","TUBE",idtmed[6],pknob_bot,3);
     z=-pdivider[2]+2*pknob[2]+pknob_bot[2];
-    //      printf("knobbot %f\n",z);
-    gMC->Gspos("0KB",1,"0DIV",0,0,z,0,"ONLY");
-    gMC->Gsvolu("0VA","TUBE",idtmed[6],pknob_vac,3);
+    //      printf(knobbot %f\n",z);
+    gMC->Gspos("0KB",1,"0DIV ",0,0,z,0,"ONLY");
+    gMC->Gsvolu("0VAC","TUBE",idtmed[3],pknob_vac,3);
     z=-pdivider[2]+pknob_vac[2];
     //      printf("knobvac %f\n",z);
-    gMC->Gspos("0VA",1,"0DIV",0,0,z,0,"ONLY");
+    gMC->Gspos("0VAC",1,"0DIV",0,0,z,0,"ONLY");
     //Steel pins + pin holes
-    gMC->Gsvolu("0PI","TUBE",idtmed[8],ppins,3);
+    gMC->Gsvolu("0PIN","TUBE",idtmed[8],ppins,3);
     z=-pdivider[2]+ppins[2];
-    gMC->Gspos("0PI",1,"0DIV",0,0,z,0,"ONLY");
-    gMC->Gsvolu("0HO","TUBE",idtmed[11],phole,3);
+    gMC->Gspos("0PIN",1,"0DIV",0,0,z,0,"ONLY");
+    gMC->Gsvolu("0HOL","TUBE",idtmed[11],phole,3);
     z=-pdivider[2]+2*ppins[2]+phole[2];
-    gMC->Gspos("0HO",1,"0DIV",0,0,z,0,"ONLY");
+    gMC->Gspos("0HOL",1,"0DIV",0,0,z,0,"ONLY");
     
     //Socket
     gMC->Gsvolu("0V1","TUBE",idtmed[4],pdiv1,3);
@@ -220,16 +254,20 @@ void AliSTARTv0::CreateGeometry()
     gMC->Gsvolu("0V2","TUBE",idtmed[1],pdiv2,3);
     z=pdivider[2]-pdiv2[2];
     gMC->Gspos("0V2",1,"0DIV",0,0,z,0,"ONLY");
-    gMC->Gsvolu("0DR","TUBE",idtmed[4],presist,3);
+    gMC->Gsvolu("0RS","TUBE",idtmed[4],presist,3);
     z=-pdiv2[2]+presist[2];
-    gMC->Gspos("0DR",1,"0V2",0,0,z,0,"ONLY");
+    gMC->Gspos("0RS",1,"0V2",0,0,z,0,"ONLY");
     gMC->Gsvolu("0RB","TUBE",idtmed[9],pribber,3);
     z=pdiv2[2]-pribber[2];
     gMC->Gspos("0RB",1,"0V2",0,0,z,0,"ONLY");
     //      printf("z DRIB %f\n",z);
-    
+       
     
 }    
+
+
+
+    
 //------------------------------------------------------------------------
 void AliSTARTv0::CreateMaterials()
 {
@@ -358,63 +396,11 @@ void AliSTARTv0::StepManager()
 {
   //
   // Called for every step in the START Detector
-  //
-  Int_t id,copy,copy1;
-  static Float_t hits[7];
-  static Float_t edep;
-  static Int_t vol[2];
-  TLorentzVector pos;
-  
-  TClonesArray &lhits = *fHits;
-  
-  if(!gMC->IsTrackAlive()) return; // particle has disappeared
-  Float_t charge = gMC->TrackCharge();
-  if(TMath::Abs(charge)<=0.) return; //take only charged particles
-  //    gMC->Gpcxyz();
-  id=gMC->CurrentVolID(copy);
-  
-  
-  //  printf("gMC->ckine->ipart %d",gMC->ckine->ipart);
-  // Check the sensetive volume
-  if(id==fIdSens1 ) {
-    if(gMC->IsTrackEntering()) {
-      gMC->CurrentVolOffID(2,copy);
-      vol[0]=copy;
-      gMC->CurrentVolOffID(1,copy1);
-      vol[1]=copy1;
-      gMC->TrackPosition(pos);
-      hits[0] = pos[0];
-      hits[1] = pos[1];
-      hits[2] = pos[2];
-      Float_t etot=gMC->Etot();
-      hits[4]=etot;
-      Int_t part= gMC->TrackPid();
-      hits[5]=part;
-      Float_t ttime=gMC->TrackTime();
-      hits[6]=ttime*1e9;
-      edep=0;
-    }
-    if(gMC->IsTrackInside())   {
-      Float_t de=gMC->Edep(); 
-      edep=edep+de;
-      //       printf ("E deposition %f\n",edep);
-      //    for (i=0; i<=6; i++){
-      //    printf(" HITS on START inside %f\n",hits[i]); } 
-    }
-    if(gMC->IsTrackExiting())  {
-      Float_t de=gMC->Edep(); 
-      edep=edep+de;
-      hits[3]=edep*1e3;
-
-      //       for (i=0; i<=6; i++){
-      //        printf(" HITS on START Exit %f\n",hits[i]); } 
-      //for (i=0; i<=1; i++) { printf("START vol %d\n",vol[i]);}
-     
-      new(lhits[fNhits++]) AliSTARThit(fIshunt,gAlice->CurrentTrack(),vol,hits);      
-    }
-  }
-//---------------------------------------------------------------------
+  // See AliSTARTv1
+
 }
+//---------------------------------------------------------------------
+
 
 
 

diff --git a/START/AliSTARTv1.cxx b/START/AliSTARTv1.cxx
index b051b8e59154a8ad065f69660318441cd3f6d355..31595ce4cc7ad0759885cd168f741b65deee0e88 100755 (executable)
--- a/START/AliSTARTv1.cxx
+++ b/START/AliSTARTv1.cxx
@@ -95,7 +95,7 @@ void AliSTARTv1::CreateGeometry()
   Float_t pribber[3] = {0.,1.2,2.413/2.};
   Float_t presist[3] = {0.,1.2,0.087/2.};
 
-  Float_t zdetRight=69.7,zdetLeft=355.;
+  Float_t zdetRight=69.7,zdetLeft=350;
  //-------------------------------------------------------------------
  //  START volume 
  //-------------------------------------------------------------------
@@ -167,10 +167,12 @@ void AliSTARTv1::CreateGeometry()
 // PMT
       
     // Entry window (glass)
-    gMC->Gsvolu("0TOP","TUBE",idtmed[6],ptop,3);
-    z=-ppmt[2]+ptop[2];
+    gMC->Gsvolu("0TOP","TUBE",idtmed[6],ptop,3); //glass
+     //   gMC->Gsvolu("0TOP","TUBE",idtmed[12],ptop,3); //lucite
+     z=-ppmt[2]+ptop[2];
     gMC->Gspos("0TOP",1,"0PMT",0,0,z,0,"ONLY");
     //     printf("Z PTOP %f -ppmt[2] %f ptop[2] %f\n",z,-ppmt[2],ptop[2]);
+    
     // Bottom glass
     gMC->Gsvolu("0BOT","TUBE",idtmed[6],pbot,3);
     z=ppmt[2]-pbot[2];
@@ -232,7 +234,7 @@ void AliSTARTv1::CreateGeometry()
     z=pdiv2[2]-pribber[2];
     gMC->Gspos("0RB",1,"0V2",0,0,z,0,"ONLY");
     //      printf("z DRIB %f\n",z);
-    
+       
     
 }    
 //------------------------------------------------------------------------
@@ -248,7 +250,12 @@ void AliSTARTv1::CreateMaterials()
    Float_t zscin[2]={1,6};
    Float_t wscin[2]={1,1};
    Float_t denscin=1.03;
-// PMT glass SiO2
+//Lucite C(CH3)CO2CH3
+   Float_t alucite[3]={1.01,12.01,15.999};
+   Float_t zlucite[3]={1,6,8};
+   Float_t wlucite[3]={8,5,2};
+   Float_t denlucite=1.16;
+ // PMT glass SiO2
    Float_t aglass[2]={28.0855,15.9994};
    Float_t zglass[2]={14.,8.};
    Float_t wglass[2]={1.,2.};
@@ -303,6 +310,7 @@ void AliSTARTv1::CreateMaterials()
    AliMixture( 6, "Brass    $", abrass, zbrass, denbrass, 2, wbrass);
    
    AliMixture( 7, "Ribber $",aribber,zribber,denribber,-3,wribber);
+   AliMixture( 8, "Lucite$",alucite,zlucite,denlucite,-3,wlucite);
    
    
    AliMedium(1, "START Air$", 2, 0, isxfld, sxmgmx, 10., .1, 1., .003, .003);
@@ -313,6 +321,8 @@ void AliSTARTv1::CreateMaterials()
    AliMedium(8, "Steel$", 0, 0, isxfld, sxmgmx, 1., .001, 1., .001, .001);
    AliMedium(9, "Ribber  $", 7, 0, isxfld, sxmgmx, 10., .01, .1, .003, .003);
    AliMedium(11, "Brass  $", 6, 0, isxfld, sxmgmx, 10., .01, .1, .003, .003);
+   AliMedium(12, "Lucite$", 8, 1, isxfld, sxmgmx, 10., .01, 1., .003, .003);  
+
    if(fDebug) cout<<ClassName()<<": ++++++++++++++Medium set++++++++++"<<endl;
 
 //  geant3->Gsckov(idtmed[2105], 14, ppckov, absco_quarz, effic_all,rindex_quarz);
@@ -384,10 +394,14 @@ void AliSTARTv1::StepManager()
       vol[1]=copy;
       gMC->CurrentVolOffID(3,copy1);
       vol[0]=copy1;
+
       gMC->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();
       hits[4]=etot;
       Int_t iPart= gMC->TrackPid();