New Version from Alla
authorfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 21 Jan 2000 15:45:55 +0000 (15:45 +0000)
committerfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 21 Jan 2000 15:45:55 +0000 (15:45 +0000)
START/AliSTART.cxx
START/AliSTART.h
START/AliSTARTdigit.cxx [new file with mode: 0644]
START/AliSTARTdigit.h [new file with mode: 0644]
START/AliSTARThit.cxx [new file with mode: 0644]
START/AliSTARThit.h [new file with mode: 0644]
START/AliSTARTv0.cxx
START/Makefile
START/STARTLinkDef.h

index eddcade..349abfd 100755 (executable)
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.5  2000/01/19 17:17:15  fca
+Introducing a list of lists of hits -- more hits allowed for detector now
+
 Revision 1.4  1999/11/12 15:04:00  fca
 Modifications from A.Maevskaya
 
@@ -44,17 +47,20 @@ Introduction of the Copyright and cvs Log
 //                                                                           //
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
-#include <stdlib.h>
 
-#include <TTUBE.h>
-#include <TNode.h>
-#include <TGeometry.h>
-#include "AliRun.h"
-#include "AliSTART.h"
 #include <iostream.h>
 #include <fstream.h>
+
+#include "TMath.h"
+#include "TTUBE.h"
+#include "TNode.h"
+#include "TGeometry.h"
+#include "AliRun.h"
+#include "AliSTART.h"
+#include "AliSTARTdigit.h"
 #include "AliMC.h"
+#include "AliSTARThit.h"
+
 ClassImp(AliSTART)
  
 //_____________________________________________________________________________
@@ -64,6 +70,8 @@ AliSTART::AliSTART()
   // Default constructor for class AliSTART
   //
   fIshunt   = 0;
+  fHits     = 0;
+  fDigits   = 0;
 }
  
 //_____________________________________________________________________________
@@ -73,7 +81,7 @@ AliSTART::AliSTART(const char *name, const char *title)
   //
   // Standard constructor for START Detector
   //
+
   AliModule *fmd = gAlice->GetModule("FMD");
   if(fmd) {
     Int_t fmdversion = fmd->IsVersion();
@@ -82,10 +90,12 @@ AliSTART::AliSTART(const char *name, const char *title)
       exit(1);
     }
   }
   //
   // Initialise Hit array
-  fHits   = new TClonesArray("AliSTARThit",  405);
+  fHits       = new TClonesArray("AliSTARThit",  405);
   gAlice->AddHitList(fHits);
+  fDigits     = new TClonesArray("AliSTARTdigit",500);
   
   fIshunt     =  0;
   fIdSens1    =  0;
@@ -102,6 +112,16 @@ void AliSTART::AddHit(Int_t track, Int_t *vol, Float_t *hits)
   TClonesArray &lhits = *fHits;
   new(lhits[fNhits++]) AliSTARThit(fIshunt,track,vol,hits);
 }
+
+//_____________________________________________________________________________
+void AliSTART::AddDigit(Int_t *tracks,Int_t *digits)
+{
+  //
+  // Add a START digit to the list
+  //
+  TClonesArray &ldigits = *fDigits;
+  new(ldigits[fNdigits++]) AliSTARTdigit(tracks,digits);
+}
  
 //_____________________________________________________________________________
 void AliSTART::BuildGeometry()
@@ -140,8 +160,6 @@ Int_t AliSTART::DistanceToPrimitive(Int_t px, Int_t py)
   return 9999;
 }
  
-//_____________________________________________________________________________
-
 //-------------------------------------------------------------------------
 void AliSTART::Init()
 {
@@ -158,9 +176,9 @@ void AliSTART::Init()
   // Here the START initialisation code (if any!)
   for(i=0;i<80;i++) printf("*");
   printf("\n");
- //
- //
- fIdSens1=gMC->VolId("PTOP");
+  //
+  //
+  fIdSens1=gMC->VolId("PTOP");
 
 }
 
@@ -183,32 +201,151 @@ void AliSTART::MakeBranch(Option_t* option)
   }
   
 }    
+
+//_____________________________________________________________________________
+void AliSTART::Hit2digit(Int_t evnum) 
+{
+  
+  Float_t x,y,e;
+  Int_t nbytes = 0;
+  Int_t hit,i;
+  Int_t nhits;
+  Int_t volume,pmt;
+  char nameTH[8];
+  Float_t timediff,timeright,timeleft,t1,t2,timeav;
+  Float_t besttimeright,besttimeleft;
+  Float_t pp_bunch=25;
+  Int_t channel_width=10;
+  Int_t digits[3];
+  Int_t tracks[2];
+
+  TParticle *particle;
+
+  AliSTARThit  *startHit;
+
+
+  // Event ------------------------- LOOP  
+ //   for (evnum=0; evnum<=9; evnum++){
+
+    besttimeright=9999.;
+    besttimeleft=9999.;
+
+    Int_t nparticles = gAlice->GetEvent(evnum);
+    if (nparticles <= 0) return;
+    printf("\n nparticles %d\n",nparticles);
+    
+    TClonesArray *Particles = gAlice->Particles();
+    
+    sprintf(nameTH,"TreeH%d",evnum);
+    printf("%s\n",nameTH);
+    TTree *TH = gAlice->TreeH();
+    Int_t ntracks    = (Int_t) TH->GetEntries();
+    if (ntracks<=0) return;
+    // Start loop on tracks in the hits containers
+    for (Int_t track=0; track<ntracks;track++) {
+      gAlice->ResetHits();
+      nbytes += TH->GetEvent(track);
+      particle=(TParticle*)Particles->UncheckedAt(track);
+      nhits = fHits->GetEntriesFast();
+           
+      for (hit=0;hit<nhits;hit++) {
+       startHit   = (AliSTARThit*)fHits->UncheckedAt(hit);
+       pmt=startHit->fPmt;
+       e=startHit->fEtot;
+       x=startHit->fX;
+       y=startHit->fY;
+       volume = startHit->fVolume;
+       if(volume==1){
+         timeright = startHit->fTime;
+         if(timeright<besttimeright) {
+           besttimeright=timeright;
+           tracks[0]=track;
+         } //timeright
+       }//time for right shoulder
+       if(volume==2){            
+         timeleft = startHit->fTime;
+         //                printf("timeleft %f\n",timeleft);
+         if(timeleft<besttimeleft) {
+           besttimeleft=timeleft;
+           tracks[1]=track;
+         } //timeleftbest
+       }//time for left shoulder
+      } //hit loop
+    } //track loop
+    printf("\n----time1stright %f \n",besttimeright);     
+    printf("----time1stleft %f \n",besttimeleft);     
+    timediff=besttimeright-besttimeleft;
+    if (timediff!=0 && TMath::Abs(timediff)<100) {
+      //we assume centre of bunch is 5ns after TTS signal
+      //TOF values are relative of the end of bunch
+      pp_bunch=pp_bunch-10/2;
+      t1=besttimeleft+pp_bunch;
+      t2=besttimeright+pp_bunch;
+      t1=1000*t1/channel_width; //time in ps to channel_width
+      t2=1000*t2/channel_width; //time in ps to channel_width
+      printf(" t1= %f t2= %f\n",t1,t2);
+
+      timeav=(t1+t2)/2.;
+      printf("timediff= %f timeav= %f\n",timediff,timeav);
+
+      // Time to TDC signal
+      // 1024 channels for timediff, range 1ns
+      
+     timediff=512+1000*timediff/channel_width; // time in ps
+     printf("timediff= %f timeav= %f\n",timediff,timeav);
+
+
+     digits[0]=evnum;
+     digits[1]=(Int_t)(timeav);   // time in ps
+     digits[2]=(Int_t)(timediff); // time in ps
+     //  new(ldigits[fNdigits++]) AliSTARTdigit(track,digits);
  
-ClassImp(AliSTARThit)
+    
+     for (i=0; i<3; i++){
+       printf(" DIGITS on START  %d\n",digits[i]); } 
+     for (i=0; i<=1; i++) { printf("START track %d\n",tracks[i]);}
+     AddDigit(tracks,digits);
+     //     sprintf(nameTD,"TreeD%d",evnum);
+     //    gAlice->TreeD()->Fill();
+     //gAlice->TreeD()->Write();
+     //printf("%s\n",nameTD);
+     MakeTree(evnum);
+     if (fTreeD!=0) fTreeD->Fill();    
+     if (fTreeD!=0) fTreeD->Write();    
+    } // if timediff !=0
+    
+    //   } // event loop
+    
+} // end of mcro
  
 //_____________________________________________________________________________
-AliSTARThit::AliSTARThit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits):
-  AliHit(shunt, track)
+Bool_t  AliSTART::SetTree(Int_t nevent, TDirectory *dir )
 {
-  //
-  // Add a START hit
-  //
-  
-//  Int_t i;
-  fVolume = vol[0];
-  fPmt=vol[1];
-//printf("fvolume %d\n",fVolume);
-//printf("fpmt %d\n",fPmt);
-
-  fX=hits[0];
-  fY=hits[1];
-  fZ=hits[2];
-  fEdep=hits[3];
-  fEtot=hits[4];
-  fParticle=Int_t (hits[5]);
-  fTime=hits[6];
-
-//for (i=0; i<=6; i++) {printf("Hits up %f\n",hits[i]);} 
+  char treeName[100];
+  // Get Hits Tree header from file
+  sprintf(treeName,"TreeD%d",nevent);
+  fTreeD = (TTree*)dir->Get(treeName);
+  if (fTreeD == 0) return kFALSE;
+  //set Digit branch 
+  TBranch *b = fTreeD->GetBranch("Digits");
+  if (b==0) return kFALSE;
+  b->SetAddress(&fDigits);
+  return kTRUE;
 }
 
-// ClassImp(AliSTARTdigit)
+
+//_____________________________________________________________________________
+Bool_t  AliSTART::MakeTree(Int_t nevent)
+{
+  char treeName[100];
+  // Get Hits Tree header from file
+  sprintf(treeName,"TreeD%d",nevent);
+  fTreeD =  new TTree(treeName,treeName);
+  if (fTreeD == 0) return kFALSE;
+  //set Digit branch 
+  TBranch *b = fTreeD->Branch("Digits",&fDigits,40000);
+  if (b==0) return kFALSE;
+  b->SetAddress(&fDigits);
+  return kTRUE;
+}
index 01ba7df..ed6d195 100755 (executable)
  
 #include "AliDetector.h"
 #include "AliHit.h"
+#include "TNamed.h"
+#include "TTree.h"
+class TDirectory;
+R__EXTERN TDirectory *  gDirectory;
  
  
 class AliSTART : public AliDetector {
@@ -20,38 +25,32 @@ public:
   AliSTART(const char *name, const char *title);
   virtual       ~AliSTART() {}
   virtual void   AddHit(Int_t, Int_t*, Float_t*);
+  virtual void   AddDigit( Int_t*, Int_t*);
   virtual void   BuildGeometry();
-  virtual void   CreateGeometry()=0;
-  virtual void   CreateMaterials()=0; 
+  virtual void   CreateGeometry() = 0;
+  virtual void   CreateMaterials() = 0;
   virtual Int_t  DistanceToPrimitive(Int_t px, Int_t py);
-  virtual Int_t  IsVersion() const =0;
+  virtual Int_t  IsVersion() const = 0;
   virtual void   Init();
   virtual void   MakeBranch(Option_t *opt=" ");
-  virtual void   DrawModule()=0;
-  virtual void   StepManager()=0;
-  
- protected:
+  virtual void   DrawModule() = 0;
+  virtual void   StepManager() = 0;
+
+  void   Hit2digit(Int_t iEventNum);
+  void   Hit2digit(){return;}
+public:
+  TTree   *fTreeD;        //tree
+  TTree * GetTree() { return fTreeD;}
+  //return refeence to actual tree 
+  Bool_t  SetTree(Int_t nevent=0, TDirectory *dir = gDirectory);
+  //map tree from given directory
+  Bool_t  MakeTree(Int_t nevent=0);
+  //map tree from given directory
+protected:
   Int_t fIdSens1;
   ClassDef(AliSTART,1)  //Class for the START detector
 };
 
-//_____________________________________________________________________________
-class AliSTARThit : public AliHit {
-public:
-  Int_t      fVolume;
-  Int_t      fPmt;
-  Int_t      fParticle;     //Particle identificator
-  Float_t    fEdep;    //Energy deposition
-  Float_t    fEtot;    //Energy of particle 
-  Float_t    fTime;    //Time of flight 
-public:
-  AliSTARThit() {}
-  AliSTARThit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits);
-  virtual ~AliSTARThit() {}
-  
-  ClassDef(AliSTARThit,1)  //Hits for detector START
-};
+//____________________________________________________________
 
 #endif
diff --git a/START/AliSTARTdigit.cxx b/START/AliSTARTdigit.cxx
new file mode 100644 (file)
index 0000000..b3d2a46
--- /dev/null
@@ -0,0 +1,45 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/*
+$Log$
+*/ 
+
+#include "AliSTART.h"
+#include "AliSTARTdigit.h"
+#include "AliRun.h"
+ClassImp(AliSTARTdigit)
+
+AliSTARTdigit::AliSTARTdigit(Int_t *tracks, Int_t *digits):
+  AliDigit(tracks){
+  //
+  // Create START digit
+  //     The creator for the AliSTARTdigit class. This routine fills the
+  // AliSTARTdigit data members from the array digits. The array of track
+  // numbers are passed to the AliDigit creator. The order of the elements
+  // in the digits array are fEvent = digits[0], fAmplitude = digits[1],
+  // fTime_average = digits[1], fTime_diff = digits[1], and fDet = digits[4].
+  // Therefore the array digits is expected to be at least 5 elements long.
+  //
+  fEvent        = digits[0];
+  fTime_average = digits[1];
+  fTime_diff    = digits[2];
+
+}
+
+
+
+
+
diff --git a/START/AliSTARTdigit.h b/START/AliSTARTdigit.h
new file mode 100644 (file)
index 0000000..cfe1a8e
--- /dev/null
@@ -0,0 +1,26 @@
+#ifndef STARTDIGIT_H
+#define STARTDIGIT_H
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+/* $Id$ */
+
+#include "AliDigit.h"
+#include "AliSTART.h"
+
+//___________________________________________
+class AliSTARTdigit: public AliDigit  {
+////////////////////////////////////////////////////////////////////////
+ public:
+    Int_t fEvent;            // Event number
+    Int_t fTime_average;     // Average time
+    Int_t fTime_diff;  // Time difference
+
+ public:
+    AliSTARTdigit() {}
+    AliSTARTdigit(Int_t *tracks, Int_t *digits);
+    virtual ~AliSTARTdigit() {}
+
+    ClassDef(AliSTARTdigit,1)  //Digit (Header) object for set:ITS
+};
+#endif
diff --git a/START/AliSTARThit.cxx b/START/AliSTARThit.cxx
new file mode 100644 (file)
index 0000000..9d8f8c0
--- /dev/null
@@ -0,0 +1,43 @@
+/**************************************************************************
+ * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ *                                                                        *
+ * Author: The ALICE Off-line Project.                                    *
+ * Contributors are mentioned in the code where appropriate.              *
+ *                                                                        *
+ * Permission to use, copy, modify and distribute this software and its   *
+ * documentation strictly for non-commercial purposes is hereby granted   *
+ * without fee, provided that the above copyright notice appears in all   *
+ * copies and that both the copyright notice and this permission notice   *
+ * appear in the supporting documentation. The authors make no claims     *
+ * about the suitability of this software for any purpose. It is          *
+ * provided "as is" without express or implied warranty.                  *
+ **************************************************************************/
+
+/*
+$Log$
+*/ 
+
+#include "AliSTARThit.h"
+
+ClassImp(AliSTARThit)
+//_____________________________________________________________________________
+AliSTARThit::AliSTARThit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits):
+  AliHit(shunt, track)
+{
+  //
+  // Add a START hit
+  //
+  
+  fVolume = vol[0];
+  fPmt=vol[1];
+  fX=hits[0];
+  fY=hits[1];
+  fZ=hits[2];
+  fEdep=hits[3];
+  fEtot=hits[4];
+  fParticle=Int_t (hits[5]);
+  fTime=hits[6];
+
+  // for (Int_t i=0; i<=6; i++) {printf("Hits up %f\n",hits[i]);} 
+}
diff --git a/START/AliSTARThit.h b/START/AliSTARThit.h
new file mode 100644 (file)
index 0000000..642c3e3
--- /dev/null
@@ -0,0 +1,31 @@
+#ifndef STARTHIT_H
+#define STARTHIT_H
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+/* $Id$ */
+
+////////////////////////////////////////////////
+//  Manager and hits classes for set:START     //
+////////////////////////////////////////////////
+#include "AliDetector.h"
+#include "AliHit.h"
+class AliSTARThit : public AliHit {
+public:
+  Int_t      fVolume;
+  Int_t      fPmt;
+  Int_t      fParticle;     //Particle identificator
+  Float_t    fEdep;    //Energy deposition
+  Float_t    fEtot;    //Energy of particle 
+  Float_t    fTime;    //Time of flight 
+public:
+  AliSTARThit() {}
+  AliSTARThit(Int_t shunt, Int_t track, Int_t *vol, Float_t *hits);
+  virtual ~AliSTARThit() {}
+  
+  ClassDef(AliSTARThit,1)  //Hits for detector START
+};
+#endif
index a707ede..8706954 100755 (executable)
 
 /*
 $Log$
+Revision 1.6  1999/11/12 15:04:00  fca
+Modifications from A.Maevskaya
+
 Revision 1.5  1999/09/29 09:24:29  fca
 Introduction of the Copyright and cvs Log
 
-*/
+*/ 
 
 /////////////////////////////////////////////////////////////////////
 //                                                                 //
@@ -41,6 +44,7 @@ Introduction of the Copyright and cvs Log
 #include "AliSTARTv0.h"
 #include "AliRun.h"
 #include "AliMC.h"
+#include "AliSTARThit.h"
 
 #include <iostream.h>
 #include <fstream.h>
@@ -73,7 +77,7 @@ void AliSTARTv0::CreateGeometry()
   //
 
 
-  Int_t *idtmed = fIdtmed->GetArray()-2099;
+  Int_t *idtmed = fIdtmed->GetArray();
   
   Int_t is;
   Int_t idrotm[999];
@@ -101,105 +105,113 @@ void AliSTARTv0::CreateGeometry()
  //-------------------------------------------------------------------
  //  START volume 
  //-------------------------------------------------------------------
-
+  
     AliMatrix(idrotm[901], 90., 0., 90., 90., 180., 0.);
-    gMC->Gsvolu("STRT","TUBE",idtmed[2101-1],pstart,3);
+    gMC->Gsvolu("STRT","TUBE",idtmed[1],pstart,3);
     gMC->Gspos("STRT",1,"ALIC",0.,0.,zdet,0,"ONLY");
     gMC->Gspos("STRT",2,"ALIC",0.,0.,-zdet,idrotm[901],"ONLY");
 
 //START interior
-    gMC->Gsvolu("PMT ","TUBE",idtmed[2103-1],ppmt,3);     
-    gMC->Gsvolu("DIVI","TUBE",idtmed[2103-1],pdivider,3);     
+    gMC->Gsvolu("PMT ","TUBE",idtmed[3],ppmt,3);     
+    gMC->Gsvolu("DIVI","TUBE",idtmed[3],pdivider,3);     
 
 // first ring: 13 units of Scintillator+PMT+divider
-    for (is=1; is<=13; is++)
-    {  
-      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];
-      gMC->Gspos("PMT ",is,"STRT",x,y,z,0,"ONLY");
-      z+=ppmt[2]+pdiv2[2];
-      printf(" is %d, z Divider %f\n",is,z);
-      gMC->Gspos("DIVI",is,"STRT",x,y,z,0,"ONLY");
-    }
+    Double_t dang1 = 2*TMath::Pi()/12;
+    for (is=1; is<=12; is++)
+      {  
+       x=6.5*TMath::Sin(is*dang1);
+       y=6.5*TMath::Cos(is*dang1);
+       z=-pstart[2]+ppmt[2];
+       gMC->Gspos("PMT ",is,"STRT",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("DIVI",is,"STRT",x,y,z,0,"ONLY");
+      }
+     /*  
 //second ring: 20 units of Scintillator+PMT+divider
-    for (is=14; is<=33;is++)  
-    {  
-      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);
+      Double_t dang2 = 2*TMath::Pi()/26;
+      Double_t dang3 = 2*TMath::Pi()/20;
+       for (is=14; is<=33;is++)  
+     {  
+     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("PMT ",is,"STRT",x,y,z,0,"ONLY");
-      z+=ppmt[2]+pdiv2[2];
+      z=z+ppmt[2]+pdiv2[2];
       gMC->Gspos("DIVI",is,"STRT",x,y,z,0,"ONLY");
-    }
+      }
+     */
 // PMT
       
-// Entry window (glass)
-      gMC->Gsvolu("PTOP","TUBE",idtmed[2106-1],ptop,3);
-      z=-ppmt[2]+ptop[2];
-      gMC->Gspos("PTOP",1,"PMT ",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("PBOT","TUBE",idtmed[2106-1],pbot,3);
-      z=ppmt[2]-pbot[2];
-      printf("Z bottom %f\n",z);
-      gMC->Gspos("PBOT",1,"PMT ",0,0,z,0,"ONLY");
-// Side cylinder glass
-      gMC->Gsvolu("POUT","TUBE",idtmed[2106-1],pglass,3);
-      z=ppmt[2]-pglass[2];
-//      printf("Z glass %f\n",z);
-      gMC->Gspos("POUT",1,"PMT ",0,0,z,0,"ONLY");
-//PMT electrodes support structure
-      gMC->Gsvolu("PCER","TUBE",idtmed[2104-1],pcer,3);
-      gMC->Gsvolu("PSTE","TUBE",idtmed[2108-1],psteel,3);
-      z=-ppmt[2]+2*ptop[2]+0.3;;
-//      printf("Z Cer 1 %f\n",z);
-      for (is=1; is<=15; is++)
+    // Entry window (glass)
+    gMC->Gsvolu("PTOP","TUBE",idtmed[6],ptop,3);
+    z=-ppmt[2]+ptop[2];
+    gMC->Gspos("PTOP",1,"PMT ",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("PBOT","TUBE",idtmed[6],pbot,3);
+    z=ppmt[2]-pbot[2];
+    printf("Z bottom %f\n",z);
+    gMC->Gspos("PBOT",1,"PMT ",0,0,z,0,"ONLY");
+    // Side cylinder glass
+    gMC->Gsvolu("POUT","TUBE",idtmed[6],pglass,3);
+    z=ppmt[2]-pglass[2];
+    //      printf("Z glass %f\n",z);
+    gMC->Gspos("POUT",1,"PMT ",0,0,z,0,"ONLY");
+    //PMT electrodes support structure
+    gMC->Gsvolu("PCER","TUBE",idtmed[4],pcer,3);
+    gMC->Gsvolu("PSTE","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("PCER",is,"PMT",0,0,z,0,"ONLY");
-         z=z+psteel[2]+pcer[2];
-         gMC->Gspos("PSTE",is,"PMT",0,0,z,0,"ONLY");
-       }
-
-// Divider
-// Knob at the bottom of PMT baloon
-      gMC->Gsvolu("KNOB","TUBE",idtmed[2106-1],pknob,3);
-      z=-pdivider[2]+pknob[2];
-//      printf("zknob %f\n",z);
-      gMC->Gspos("KNOB",1,"DIVI",0,0,z,0,"ONLY");
-      gMC->Gsvolu("KNBO","TUBE",idtmed[2106-1],pknob_bot,3);
-      z=-pdivider[2]+2*pknob[2]+pknob_bot[2];
-//      printf("knobbot %f\n",z);
-      gMC->Gspos("KNBO",1,"DIVI ",0,0,z,0,"ONLY");
-      gMC->Gsvolu("KNVA","TUBE",idtmed[2106-1],pknob_vac,3);
-      z=-pdivider[2]+pknob_vac[2];
-//      printf("knobvac %f\n",z);
-      gMC->Gspos("KNVA",1,"DIVI",0,0,z,0,"ONLY");
- //Steel pins + pin holes
-      gMC->Gsvolu("PINS","TUBE",idtmed[2108-1],ppins,3);
-      z=-pdivider[2]+ppins[2];
-      gMC->Gspos("PINS",1,"DIVI",0,0,z,0,"ONLY");
-      gMC->Gsvolu("HOLE","TUBE",idtmed[2111-1],phole,3);
-      z=-pdivider[2]+2*ppins[2]+phole[2];
-      gMC->Gspos("HOLE",1,"DIVI",0,0,z,0,"ONLY");
-
-//Socket
-      gMC->Gsvolu("DIV1","TUBE",idtmed[2104-1],pdiv1,3);
-      z=-pdivider[2]+pdiv1[2];
-      gMC->Gspos("DIV1",1,"DIVI",0,0,z,0,"ONLY");
-//Resistors
-      gMC->Gsvolu("DIV2","TUBE",idtmed[2101-1],pdiv2,3);
-      z=pdivider[2]-pdiv2[2];
-      gMC->Gspos("DIV2",1,"DIVI",0,0,z,0,"ONLY");
-      gMC->Gsvolu("DRES","TUBE",idtmed[2104-1],presist,3);
-      z=-pdiv2[2]+presist[2];
-      gMC->Gspos("DRES",1,"DIV2",0,0,z,0,"ONLY");
-      gMC->Gsvolu("DRIB","TUBE",idtmed[2109-1],pribber,3);
-      z=pdiv2[2]-pribber[2];
-      gMC->Gspos("DRIB",1,"DIV2",0,0,z,0,"ONLY");
-//      printf("z DRIB %f\n",z);
-
+       z=z+psteel[2]+pcer[2];
+       gMC->Gspos("PCER",is,"PMT",0,0,z,0,"ONLY");
+       z=z+psteel[2]+pcer[2];
+       gMC->Gspos("PSTE",is,"PMT",0,0,z,0,"ONLY");
+      }
+    
+    // Divider
+    // Knob at the bottom of PMT baloon
+    
+    gMC->Gsvolu("KNOB","TUBE",idtmed[6],pknob,3);
+    z=-pdivider[2]+pknob[2];
+    //      printf("zknob %f\n",z);
+    gMC->Gspos("KNOB",1,"DIVI",0,0,z,0,"ONLY");
+    gMC->Gsvolu("KNBO","TUBE",idtmed[6],pknob_bot,3);
+    z=-pdivider[2]+2*pknob[2]+pknob_bot[2];
+    //      printf("knobbot %f\n",z);
+    gMC->Gspos("KNBO",1,"DIVI ",0,0,z,0,"ONLY");
+    gMC->Gsvolu("KNVA","TUBE",idtmed[6],pknob_vac,3);
+    z=-pdivider[2]+pknob_vac[2];
+    //      printf("knobvac %f\n",z);
+    gMC->Gspos("KNVA",1,"DIVI",0,0,z,0,"ONLY");
+    //Steel pins + pin holes
+    gMC->Gsvolu("PINS","TUBE",idtmed[8],ppins,3);
+    z=-pdivider[2]+ppins[2];
+    gMC->Gspos("PINS",1,"DIVI",0,0,z,0,"ONLY");
+    gMC->Gsvolu("HOLE","TUBE",idtmed[11],phole,3);
+    z=-pdivider[2]+2*ppins[2]+phole[2];
+    gMC->Gspos("HOLE",1,"DIVI",0,0,z,0,"ONLY");
+    
+    //Socket
+    gMC->Gsvolu("DIV1","TUBE",idtmed[4],pdiv1,3);
+    z=-pdivider[2]+pdiv1[2];
+    gMC->Gspos("DIV1",1,"DIVI",0,0,z,0,"ONLY");
+    //Resistors
+    gMC->Gsvolu("DIV2","TUBE",idtmed[1],pdiv2,3);
+    z=pdivider[2]-pdiv2[2];
+    gMC->Gspos("DIV2",1,"DIVI",0,0,z,0,"ONLY");
+    gMC->Gsvolu("DRES","TUBE",idtmed[4],presist,3);
+    z=-pdiv2[2]+presist[2];
+    gMC->Gspos("DRES",1,"DIV2",0,0,z,0,"ONLY");
+    gMC->Gsvolu("DRIB","TUBE",idtmed[9],pribber,3);
+    z=pdiv2[2]-pribber[2];
+    gMC->Gspos("DRIB",1,"DIV2",0,0,z,0,"ONLY");
+    //      printf("z DRIB %f\n",z);
+    
+    
 }    
 //------------------------------------------------------------------------
 void AliSTARTv0::CreateMaterials()
@@ -215,16 +227,16 @@ void AliSTARTv0::CreateMaterials()
    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.};
-    Float_t wglass[2]={1.,2.};
-    Float_t dglass=2.65;
+   Float_t aglass[2]={28.0855,15.9994};
+   Float_t zglass[2]={14.,8.};
+   Float_t wglass[2]={1.,2.};
+   Float_t dglass=2.65;
 // Ceramic   97.2% Al2O3 , 2.8% SiO2
-    Float_t acer[2],zcer[2],wcer[2]={0.972,0.028};
-    Float_t aal2o3[2]  = { 26.981539,15.9994 };
-    Float_t zal2o3[2]  = { 13.,8. };
-    Float_t wal2o3[2]  = { 2.,3. };
-    Float_t denscer  = 3.6;
+   Float_t acer[2],zcer[2],wcer[2]={0.972,0.028};
+   Float_t aal2o3[2]  = { 26.981539,15.9994 };
+   Float_t zal2o3[2]  = { 13.,8. };
+   Float_t wal2o3[2]  = { 2.,3. };
+   Float_t denscer  = 3.6;
 
 // Brass 80% Cu, 20% Zn
    Float_t abrass[2] = {63.546,65.39};
@@ -237,41 +249,53 @@ void AliSTARTv0::CreateMaterials()
    Float_t zribber[3] = {6.,1.,16.};
    Float_t wribber[3] = {6.,12.,1.};
    Float_t denribber=0.8;
+   /*
+// Definition Cherenkov parameters
+   Float_t ppckov[14] = { 5.63e-9,5.77e-9,5.9e-9,6.05e-9,6.2e-9,6.36e-9,6.52e-9,6.7e-9,6.88e-9,7.08e-9,7.3e-9,7.51e-9,7.74e-9,8e-9 };
+   Float_t rindex_quarz[14] = { 1.528309,1.533333,
+                               1.538243,1.544223,1.550568,1.55777,
+                               1.565463,1.574765,1.584831,1.597027,
+                               1.611858,1.6277,1.6472,1.6724 };
  
-   
+   Float_t absco_quarz[14] = { 20.126,16.27,13.49,11.728,9.224,8.38,7.44,7.17,
+                               6.324,4.483,1.6,.323,.073,0. };
+   */
+   //   Int_t *idtmed = fIdtmed->GetArray()-999;
+    
+   //  TGeant3 *geant3 = (TGeant3*) gMC;
+    
 //*** 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);
- AliMaterial(2, "START Air$", 14.61, 7.3, .001205, 30423.,999); 
-
- AliMixture( 3, "Al2O3   $", aal2o3, zal2o3, denscer, -2, wal2o3);
- AliMixture( 4, "PMT glass   $",aglass,zglass,dglass,-2,wglass);
-  char namate[21];
-  gMC->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);
-  acer[1]=a;
-  zcer[1]=z;
-  
- AliMixture( 9, "Ceramic    $", acer, zcer, denscer, 2, wcer);
- AliMixture( 5, "Scintillator$",ascin,zscin,denscin,-2,wscin);
- AliMixture( 6, "Brass    $", abrass, zbrass, denbrass, 2, wbrass);
-
- AliMixture( 7, "Ribber $",aribber,zribber,denribber,-3,wribber);
-
-//**
- AliMedium(1, "START Air$", 2, 0, ISXFLD, SXMGMX, 10., .1, 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);
- AliMedium(8, "Steel$", 0, 0, ISXFLD, SXMGMX, 1., .001, 1., .001, .001);
- AliMedium(11, "Brass  $", 6, 0, ISXFLD, SXMGMX, 10., .01, .1, .003, .003);
- AliMedium(9, "Ribber  $", 7, 0, ISXFLD, SXMGMX, 10., .01, .1, .003, .003);
+   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);
+   AliMaterial(2, "START Air$", 14.61, 7.3, .001205, 30423.,999); 
+
+   AliMixture( 3, "Al2O3   $", aal2o3, zal2o3, denscer, -2, wal2o3);
+   AliMixture( 4, "PMT glass   $",aglass,zglass,dglass,-2,wglass);
+   char namate[21];
+   gMC->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);
+   acer[1]=a;
+   zcer[1]=z;
+   
+   AliMixture( 9, "Ceramic    $", acer, zcer, denscer, 2, wcer);
+   AliMixture( 5, "Scintillator$",ascin,zscin,denscin,-2,wscin);
+   AliMixture( 6, "Brass    $", abrass, zbrass, denbrass, 2, wbrass);
+   
+   AliMixture( 7, "Ribber $",aribber,zribber,denribber,-3,wribber);
+   
+   
+   AliMedium(1, "START Air$", 2, 0, ISXFLD, SXMGMX, 10., .1, 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);
+   AliMedium(8, "Steel$", 0, 0, ISXFLD, SXMGMX, 1., .001, 1., .001, .001);
+   AliMedium(11, "Brass  $", 6, 0, ISXFLD, SXMGMX, 10., .01, .1, .003, .003);
+   AliMedium(9, "Ribber  $", 7, 0, ISXFLD, SXMGMX, 10., .01, .1, .003, .003);
 
+//  geant3->Gsckov(idtmed[2105], 14, ppckov, absco_quarz, effic_all,rindex_quarz);
 
 }
 //---------------------------------------------------------------------
@@ -280,31 +304,31 @@ void AliSTARTv0::DrawModule()
 //
 // Draw a shaded view of the Forward multiplicity detector version 0
 //
-
-//Set ALIC mother transparent
-gMC->Gsatt("ALIC","SEEN",0);
-//
-//Set volumes visible
-gMC->Gsatt("STRT","SEEN",0);
-gMC->Gsatt("PMT ","SEEN",1);
-gMC->Gsatt("DIVI","SEEN",1);
-//
-gMC->Gdopt("hide","on");
-gMC->Gdopt("shad","on");
-gMC->SetClipBox(".");
-gMC->SetClipBox("*",0,1000,-1000,1000,-1000,1000);
-gMC->DefaultRange();
-gMC->Gdraw("alic",40,30,0,12,9.5,.2,0.2);
-gMC->Gdhead(1111,"T-Zero detector");
-gMC->Gdopt("hide","off");
+  
+  //Set ALIC mother transparent
+  gMC->Gsatt("ALIC","SEEN",0);
+  //
+  //Set volumes visible
+  gMC->Gsatt("STRT","SEEN",0);
+  gMC->Gsatt("PMT ","SEEN",1);
+  gMC->Gsatt("DIVI","SEEN",1);
+  //
+  gMC->Gdopt("hide","on");
+  gMC->Gdopt("shad","on");
+  gMC->SetClipBox(".");
+  gMC->SetClipBox("*",0,1000,-1000,1000,-1000,1000);
+  gMC->DefaultRange();
+  gMC->Gdraw("alic",40,30,0,12,9.5,.7,0.7);
+  gMC->Gdhead(1111,"T-Zero detector");
+  gMC->Gdopt("hide","off");
 }
+
 //-------------------------------------------------------------------
 void AliSTARTv0::Init()
 {
-  // Initialises version 0 of the Forward Multiplicity Detector
-  //
-  
-  //Int_t *idtmed  = gAlice->Idtmed();
+// Initialises version 0 of the Forward Multiplicity Detector
+//
+//Int_t *idtmed  = gAlice->Idtmed();
   AliSTART::Init();
   fIdSens1=gMC->VolId("PTOP");
   printf("*** START version 0 initialized ***\n");
@@ -323,62 +347,60 @@ void AliSTARTv0::StepManager()
   static Float_t edep;
   static Int_t vol[2];
   TLorentzVector pos;
-
+  
   TClonesArray &lhits = *fHits;
-  //AliMC* gMC=AliMC::GetMC();
-  //  TGeant3* geant3= (TGeant3*)gMC; 
   
   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("igauto %d\n",gMC->ctrak->igauto);
-//  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);      }
+  //    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);      
+    }
+  }
+//---------------------------------------------------------------------
+}
+
+
+
 
 
 
index 8d726f9..cacafa1 100644 (file)
@@ -9,7 +9,7 @@ PACKAGE = START
 
 # C++ sources
 
-SRCS          = AliSTART.cxx AliSTARTv0.cxx
+SRCS          = AliSTART.cxx AliSTARTv0.cxx AliSTARThit.cxx AliSTARTdigit.cxx
 
 # C++ Headers
 
index 269997e..6538c36 100755 (executable)
@@ -11,5 +11,6 @@
 #pragma link C++ class  AliSTART;
 #pragma link C++ class  AliSTARTv0;
 #pragma link C++ class  AliSTARThit;
+#pragma link C++ class  AliSTARTdigit;
 
 #endif