* provided "as is" without express or implied warranty. *
**************************************************************************/
-/*
-$Log$
-Revision 1.7.8.1 2002/06/10 15:29:36 hristov
-Merged with v3-08-02
-
-Revision 1.7 2001/10/04 14:33:43 coppedis
-Second EM ZDC added at 7.35 m from IP
-
-Revision 1.6 2001/09/26 16:07:40 coppedis
-Changes in StepManager suggested by J.Chudoba
-
-Revision 1.5 2001/06/15 14:51:39 coppedis
-Geometry bug corrected
-
-Revision 1.4 2001/06/13 11:17:49 coppedis
-Bug corrected
-
-Revision 1.3 2001/06/13 11:11:02 coppedis
-Minor changes
-
-Revision 1.2 2001/06/12 13:45:11 coppedis
-TDI in correct position and minor correction
-
-Revision 1.1 2001/05/14 09:57:39 coppedis
-A different geometry for the ZDCs
-
-
-*/
+/* $Id$ */
///////////////////////////////////////////////////////////////////////
// //
// --- ROOT system
#include <TBRIK.h>
-#include <TNode.h>
+#include <TLorentzVector.h>
#include <TMath.h>
+#include <TNode.h>
#include <TRandom.h>
#include <TSystem.h>
#include <TTree.h>
-
+#include <TVirtualMC.h>
// --- AliRoot classes
-#include "AliZDCv2.h"
-#include "AliZDCHit.h"
-#include "AliRun.h"
+#include "AliConst.h"
#include "AliDetector.h"
#include "AliMagF.h"
-#include "AliMC.h"
-//#include "AliCallf77.h"
-#include "AliConst.h"
#include "AliPDG.h"
-#include "TLorentzVector.h"
+#include "AliRun.h"
+#include "AliZDCHit.h"
+#include "AliZDCv2.h"
+#include "AliMC.h"
ClassImp(AliZDCv2)
fMedSensZP = 0;
fMedSensZEM = 0;
fMedSensGR = 0;
-// fMedSensPI = 0;
-// fMedSensTDI = 0;
+ fMedSensPI = 0;
+ fMedSensTDI = 0;
// Parameters for light tables
fDimZP[2] = 75.;
fPosZN[0] = 0.;
fPosZN[1] = 1.2;
- fPosZN[2] = 11650.;
+ fPosZN[2] = 11650.;
fPosZP[0] = -23.9;
fPosZP[1] = 0.;
- fPosZP[2] = 11600.;
+ fPosZP[2] = 11600.;
fFibZN[0] = 0.;
fFibZN[1] = 0.01825;
fFibZN[2] = 50.;
// Parameters for EM calorimeter geometry
fPosZEM[0] = 8.5;
fPosZEM[1] = 0.;
-// fPosZEM[2] = -830.;
- fPosZEM[2] = -735.;
+ fPosZEM[2] = 735.;
fZEMLength = 0.;
}
void AliZDCv2::CreateGeometry()
{
//
- // Create the geometry for the Zero Degree Calorimeter version 1
+ // Create the geometry for the Zero Degree Calorimeter version 2
//* Initialize COMMON block ZDC_CGEOM
//*
Int_t *idtmed = fIdtmed->GetArray();
// -- Mother of the ZDCs (Vacuum PCON)
+ Int_t irotM;
+ gMC->Matrix(irotM,90.,180.,90.,90.,180.,0.);
+
+ zd1 = 2092.;
conpar[0] = 0.;
conpar[1] = 360.;
conpar[2] = 2.;
- conpar[3] = 2000.;
+ conpar[3] = zd1;
conpar[4] = 0.;
conpar[5] = 55.;
- conpar[6] = 13060.;
+ conpar[6] = 13500.;
conpar[7] = 0.;
conpar[8] = 55.;
gMC->Gsvolu("ZDC ", "PCON", idtmed[11], conpar, 9);
- gMC->Gspos("ZDC ", 1, "ALIC", 0., 0., 0., 0, "ONLY");
+ gMC->Gspos("ZDC ", 1, "ALIC", 0., 0., 0., irotM, "ONLY");
// -- FIRST SECTION OF THE BEAM PIPE (from compensator dipole to
// the beginning of D1)
-
- zd1 = 2000.;
-
+
tubpar[0] = 6.3/2.;
tubpar[1] = 6.7/2.;
- tubpar[2] = 3838.3/2.;
+ // From beginning of ZDC volumes to beginning of D1
+ tubpar[2] = (5838.3-zd1)/2.;
gMC->Gsvolu("QT01", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT01", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT01", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
//-- SECOND SECTION OF THE BEAM PIPE (from the end of D1 to the
// beginning of D2)
tubpar[1] = 3.47+0.2;
tubpar[2] = 958.5/2.;
gMC->Gsvolu("QT02", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT02", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT02", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += 2.*tubpar[2];
conpar[3] = 10./2.;
conpar[4] = 10.4/2.;
gMC->Gsvolu("QC01", "CONE", idtmed[7], conpar, 5);
- gMC->Gspos("QC01", 1, "ZDC ", 0., 0., conpar[0] + zd1, 0, "ONLY");
+ gMC->Gspos("QC01", 1, "ZDC ", 0., 0., conpar[0]+zd1, 0, "ONLY");
zd1 += 2.*conpar[0];
tubpar[1] = 10.4/2.;
tubpar[2] = 50./2.;
gMC->Gsvolu("QT03", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT03", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT03", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += tubpar[2]*2.;
tubpar[1] = 10.4/2.;
tubpar[2] = 10./2.;
gMC->Gsvolu("QT04", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT04", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT04", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += tubpar[2] * 2.;
tubpar[1] = 10.4/2.;
tubpar[2] = 3.16/2.;
gMC->Gsvolu("QT05", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT05", 1, "ZDC ", 0., 0., tubpar[0] + zd1, 0, "ONLY");
+ gMC->Gspos("QT05", 1, "ZDC ", 0., 0., tubpar[0]+zd1, 0, "ONLY");
zd1 += tubpar[2] * 2.;
tubpar[1] = 10.4/2;
tubpar[2] = 190./2.;
gMC->Gsvolu("QT06", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT06", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT06", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += tubpar[2] * 2.;
conpar[3] = 20.6/2.;
conpar[4] = 21./2.;
gMC->Gsvolu("QC02", "CONE", idtmed[7], conpar, 5);
- gMC->Gspos("QC02", 1, "ZDC ", 0., 0., conpar[0] + zd1, 0, "ONLY");
+ gMC->Gspos("QC02", 1, "ZDC ", 0., 0., conpar[0]+zd1, 0, "ONLY");
zd1 += conpar[0] * 2.;
tubpar[1] = 21./2.;
tubpar[2] = 450./2.;
gMC->Gsvolu("QT07", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT07", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT07", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += tubpar[2] * 2.;
conpar[3] = 25.4/2.;
conpar[4] = 25.8/2.;
gMC->Gsvolu("QC03", "CONE", idtmed[7], conpar, 5);
- gMC->Gspos("QC03", 1, "ZDC ", 0., 0., conpar[0] + zd1, 0, "ONLY");
+ gMC->Gspos("QC03", 1, "ZDC ", 0., 0., conpar[0]+zd1, 0, "ONLY");
zd1 += conpar[0] * 2.;
tubpar[1] = 25.8/2.;
tubpar[2] = 205.8/2.;
gMC->Gsvolu("QT08", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT08", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT08", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += tubpar[2] * 2.;
// QT09 is 10 cm longer to accomodate TDI
tubpar[2] = 515.4/2.;
gMC->Gsvolu("QT09", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT09", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT09", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
// --- Insert TDI (inside ZDC volume)
boxpar[1] = 5.6;
boxpar[2] = 400./2.;
gMC->Gsvolu("QTD1", "BOX ", idtmed[7], boxpar, 3);
- gMC->Gspos("QTD1", 1, "ZDC ", 3., 10.6, tubpar[2] + zd1 + 56.3, 0, "ONLY");
- gMC->Gspos("QTD1", 2, "ZDC ", 3., -10.6, tubpar[2] + zd1 + 56.3, 0, "ONLY");
+ gMC->Gspos("QTD1", 1, "ZDC ", 3., 10.6, tubpar[2]+zd1+56.3, 0, "ONLY");
+ gMC->Gspos("QTD1", 2, "ZDC ", 3., -10.6, tubpar[2]+zd1+56.3, 0, "ONLY");
boxpar[0] = 0.2/2.;
boxpar[1] = 5.6;
boxpar[2] = 400./2.;
gMC->Gsvolu("QTD2", "BOX ", idtmed[6], boxpar, 3);
- gMC->Gspos("QTD2", 1, "ZDC ", 8.6+boxpar[0], 0., tubpar[2] + zd1 + 56.3, 0, "ONLY");
+ gMC->Gspos("QTD2", 1, "ZDC ", 8.6+boxpar[0], 0., tubpar[2]+zd1+56.3, 0, "ONLY");
// tubspar[0] = 6.2; // R = 6.2 cm----------------------------------------
// tubspar[1] = 6.4;
tubspar[3] = 180.-75.5;
tubspar[4] = 180.+75.5;
gMC->Gsvolu("QTD3", "TUBS", idtmed[6], tubspar, 5);
- gMC->Gspos("QTD3", 1, "ZDC ", 0., 0., tubpar[2] + zd1 + 56.3, 0, "ONLY");
+ gMC->Gspos("QTD3", 1, "ZDC ", 0., 0., tubpar[2]+zd1+56.3, 0, "ONLY");
zd1 += tubpar[2] * 2.;
// QT10 is 10 cm shorter
tubpar[2] = 690./2.;
gMC->Gsvolu("QT10", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT10", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT10", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += tubpar[2] * 2.;
tubpar[1] = 50.4/2.;
tubpar[2] = 778.5/2.;
gMC->Gsvolu("QT11", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT11", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT11", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += tubpar[2] * 2.;
conpar[3] = 55./2.;
conpar[4] = 55.4/2.;
gMC->Gsvolu("QC04", "CONE", idtmed[7], conpar, 5);
- gMC->Gspos("QC04", 1, "ZDC ", 0., 0., conpar[0] + zd1, 0, "ONLY");
+ gMC->Gspos("QC04", 1, "ZDC ", 0., 0., conpar[0]+zd1, 0, "ONLY");
zd1 += conpar[0] * 2.;
tubpar[1] = 55.4/2.;
tubpar[2] = 730./2.;
gMC->Gsvolu("QT12", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT12", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT12", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += tubpar[2] * 2.;
conpar[3] = 68./2.;
conpar[4] = 68.4/2.;
gMC->Gsvolu("QC05", "CONE", idtmed[7], conpar, 5);
- gMC->Gspos("QC05", 1, "ZDC ", 0., 0., conpar[0] + zd1, 0, "ONLY");
+ gMC->Gspos("QC05", 1, "ZDC ", 0., 0., conpar[0]+zd1, 0, "ONLY");
zd1 += conpar[0] * 2.;
tubpar[1] = 68.4/2.;
tubpar[2] = 927.3/2.;
gMC->Gsvolu("QT13", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT13", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT13", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += tubpar[2] * 2.;
tubpar[1] = 68.4/2.;
tubpar[2] = 0.2/2.;
gMC->Gsvolu("QT14", "TUBE", idtmed[8], tubpar, 3);
- gMC->Gspos("QT14", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("QT14", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
zd1 += tubpar[2] * 2.;
gMC->Gspos("QT16", 1, "QT14", 7.7, 0., 0., 0, "ONLY");
- //-- BEAM PIPE BETWEEN END OF CONICAL PIPE AND BEGINNING OF D2
+ //-- BEAM PIPE BETWEEN END OF CONICAL PIPE AND BEGINNING OF D2
tubpar[0] = 6.4/2.;
tubpar[1] = 6.8/2.;
AliMatrix(im1, 90.-0.143, 0., 90., 90., 0.143, 180.);
gMC->Gspos("QT17", 1, "ZDC ", TMath::Sin(angle) * 680.8/ 2. - 9.4,
- 0., tubpar[2] + zd1, im1, "ONLY");
+ 0., tubpar[2]+zd1, im1, "ONLY");
AliMatrix(im2, 90.+0.143, 0., 90., 90., 0.143, 0.);
gMC->Gspos("QT18", 1, "ZDC ", 9.7 - TMath::Sin(angle) * 680.8 / 2.,
- 0., tubpar[2] + zd1, im2, "ONLY");
-
- // -- BEAM PIPE ON THE OTHER SIDE OF I.P. TILL THE EM ZDC
-
- Float_t zb = -800.; // End of QBPM (from AliPIPEv0.cxx)
- tubpar[0] = 8.0/2.;
- tubpar[1] = 8.2/2.;
- tubpar[2] = (1050+zb)/2.; // From the end of QBPM to z=1050.
- gMC->Gsvolu("QT19", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("QT19", 1, "ALIC", 0., 0., zb - tubpar[2], 0, "ONLY");
-
-
+ 0., tubpar[2]+zd1, im2, "ONLY");
+
// -- END OF BEAM PIPE VOLUME DEFINITION.
// ----------------------------------------------------------------
- // -- MAGNET DEFINITION -> LHC OPTICS 6.2 (preliminary version)
-
- // ----------------------------------------------------------------
- // Replaced by the muon dipole
- // ----------------------------------------------------------------
- // -- COMPENSATOR DIPOLE (MBXW)
- // GAP (VACUUM WITH MAGNETIC FIELD)
-
-// tubpar[0] = 0.;
-// tubpar[1] = 4.5;
-// tubpar[2] = 340./2.;
-// gMC->Gsvolu("MBXW", "TUBE", idtmed[11], tubpar, 3);
-// gMC->Gspos("MBXW", 1, "ZDC ", 0., 0., tubpar[2] + 805., 0, "ONLY");
-
- // -- YOKE (IRON WITHOUT MAGNETIC FIELD)
-
-// tubpar[0] = 4.5;
-// tubpar[1] = 55.;
-// tubpar[2] = 340./2.;
-// gMC->Gsvolu("YMBX", "TUBE", idtmed[7], tubpar, 3);
-// gMC->Gspos("YMBX", 1, "ZDC ", 0., 0., tubpar[2] + 805., 0, "ONLY");
-
// ----------------------------------------------------------------
- // Replaced by the second dipole
+ // -- MAGNET DEFINITION -> LHC OPTICS 6.4
// ----------------------------------------------------------------
- // -- COMPENSATOR DIPOLE (MCBWA)
- // GAP (VACUUM WITH MAGNETIC FIELD)
-
-// tubpar[0] = 0.;
-// tubpar[1] = 4.5;
-// tubpar[2] = 170./2.;
-// gMC->Gsvolu("MCBW", "TUBE", idtmed[11], tubpar, 3);
-// gMC->Gspos("MCBW", 1, "ZDC ", 0., 0., tubpar[2] + 1921.6, 0, "ONLY");
-
- // -- YOKE (IRON WITHOUT MAGNETIC FIELD)
-
-// tubpar[0] = 4.5;
-// tubpar[1] = 55.;
-// tubpar[2] = 170./2.;
-// gMC->Gsvolu("YMCB", "TUBE", idtmed[7], tubpar, 3);
-// gMC->Gspos("YMCB", 1, "ZDC ", 0., 0., tubpar[2] + 1921.6, 0, "ONLY");
-
// -- INNER TRIPLET
zq = 2296.5;
tubpar[2] = 637./2.;
gMC->Gsvolu("YMQL", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("MQXL", 1, "ZDC ", 0., 0., tubpar[2] + zq, 0, "ONLY");
- gMC->Gspos("YMQL", 1, "ZDC ", 0., 0., tubpar[2] + zq, 0, "ONLY");
+ gMC->Gspos("MQXL", 1, "ZDC ", 0., 0., tubpar[2]+zq, 0, "ONLY");
+ gMC->Gspos("YMQL", 1, "ZDC ", 0., 0., tubpar[2]+zq, 0, "ONLY");
- gMC->Gspos("MQXL", 2, "ZDC ", 0., 0., tubpar[2] + zq + 2430., 0, "ONLY");
- gMC->Gspos("YMQL", 2, "ZDC ", 0., 0., tubpar[2] + zq + 2430., 0, "ONLY");
+ gMC->Gspos("MQXL", 2, "ZDC ", 0., 0., tubpar[2]+zq+2430., 0, "ONLY");
+ gMC->Gspos("YMQL", 2, "ZDC ", 0., 0., tubpar[2]+zq+2430., 0, "ONLY");
// -- MQX
// -- GAP (VACUUM WITH MAGNETIC FIELD)
tubpar[2] = 550./2.;
gMC->Gsvolu("YMQ ", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("MQX ", 1, "ZDC ", 0., 0., tubpar[2] + zq + 883.5, 0, "ONLY");
- gMC->Gspos("YMQ ", 1, "ZDC ", 0., 0., tubpar[2] + zq + 883.5, 0, "ONLY");
+ gMC->Gspos("MQX ", 1, "ZDC ", 0., 0., tubpar[2]+zq+908.5, 0, "ONLY");
+ gMC->Gspos("YMQ ", 1, "ZDC ", 0., 0., tubpar[2]+zq+908.5, 0, "ONLY");
- gMC->Gspos("MQX ", 2, "ZDC ", 0., 0., tubpar[2] + zq + 1533.5, 0, "ONLY");
- gMC->Gspos("YMQ ", 2, "ZDC ", 0., 0., tubpar[2] + zq + 1533.5, 0, "ONLY");
+ gMC->Gspos("MQX ", 2, "ZDC ", 0., 0., tubpar[2]+zq+1558.5, 0, "ONLY");
+ gMC->Gspos("YMQ ", 2, "ZDC ", 0., 0., tubpar[2]+zq+1558.5, 0, "ONLY");
// -- SEPARATOR DIPOLE D1
tubpar[2] = 945./2.;
gMC->Gsvolu("YD1 ", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("YD1 ", 1, "ZDC ", 0., 0., tubpar[2] + zd1, 0, "ONLY");
+ gMC->Gspos("YD1 ", 1, "ZDC ", 0., 0., tubpar[2]+zd1, 0, "ONLY");
gMC->Gspos("MD1 ", 1, "YD1 ", 0., 0., 0., 0, "ONLY");
// -- DIPOLE D2
+ //zd2 = 12147.6;
+ // --- LHC optics v6.4
zd2 = 12147.6;
// -- GAP (VACUUM WITH MAGNETIC FIELD)
tubpar[2] = 945./2.;
gMC->Gsvolu("YD2 ", "TUBE", idtmed[7], tubpar, 3);
- gMC->Gspos("YD2 ", 1, "ZDC ", 0., 0., tubpar[2] + zd2, 0, "ONLY");
+ gMC->Gspos("YD2 ", 1, "ZDC ", 0., 0., tubpar[2]+zd2, 0, "ONLY");
gMC->Gspos("MD2 ", 1, "YD2 ", -9.4, 0., 0., 0, "ONLY");
gMC->Gspos("MD2 ", 2, "YD2 ", 9.4, 0., 0., 0, "ONLY");
gMC->Gspos("ZNF4", 1, "ZNG4", 0., 0., 0., 0, "ONLY");
// --- Position the neutron calorimeter in ZDC
- gMC->Gspos("ZNEU", 1, "ZDC ", fPosZN[0], fPosZN[1], fPosZN[2] + fDimZN[2], 0, "ONLY");
+ gMC->Gspos("ZNEU", 1, "ZDC ", fPosZN[0], fPosZN[1], fPosZN[2]+fDimZN[2], 0, "ONLY");
// -------------------------------------------------------------------------------
// --- Position the proton calorimeter in ZDC
- gMC->Gspos("ZPRO", 1, "ZDC ", fPosZP[0], fPosZP[1], fPosZP[2] + fDimZP[2], 0, "ONLY");
+ gMC->Gspos("ZPRO", 1, "ZDC ", fPosZP[0], fPosZP[1], fPosZP[2]+fDimZP[2], 0, "ONLY");
// -------------------------------------------------------------------------------
gMC->Gsvolu("ZEM ", "PARA", idtmed[10], fDimZEM, 6);
Int_t irot1, irot2;
-
- gMC->Matrix(irot1,180.,0.,90.,90.,90.,0.); // Rotation matrix 1
+ gMC->Matrix(irot1,0.,0.,90.,90.,-90.,0.); // Rotation matrix 1
gMC->Matrix(irot2,180.,0.,90.,fDimZEM[3]+90.,90.,fDimZEM[3]);// Rotation matrix 2
-// printf("irot1 = %d, irot2 = %d \n", irot1, irot2);
+ //printf("irot1 = %d, irot2 = %d \n", irot1, irot2);
- gMC->Gsvolu("ZEMF", "TUBE", idtmed[3], fFibZEM, 3); // Active material
+ gMC->Gsvolu("ZEMF", "TUBE", idtmed[3], fFibZEM, 3); // Active material
- gMC->Gsdvn("ZETR", "ZEM ", fDivZEM[2], 1); // Tranches
+ gMC->Gsdvn("ZETR", "ZEM ", fDivZEM[2], 1); // Tranches
- DimPb[0] = fDimZEMPb; // Lead slices
+ DimPb[0] = fDimZEMPb; // Lead slices
DimPb[1] = fDimZEM[2];
DimPb[2] = fDimZEM[1];
DimPb[3] = 90.-fDimZEM[3];
DimPb[5] = 0.;
gMC->Gsvolu("ZEL0", "PARA", idtmed[5], DimPb, 6);
gMC->Gsvolu("ZEL1", "PARA", idtmed[5], DimPb, 6);
-// gMC->Gsvolu("ZEL2", "PARA", idtmed[5], DimPb, 6);
+ //gMC->Gsvolu("ZEL2", "PARA", idtmed[5], DimPb, 6);
// --- Position the lead slices in the tranche
Float_t zTran = fDimZEM[0]/fDivZEM[2];
// --- Positioning the ZEM into the ZDC - rotation for 90 degrees
// NB -> In AliZDCv2 ZEM is positioned in ALIC (instead of in ZDC) volume
// beacause it's impossible to make a ZDC pcon volume to contain
- // both hadronics and EM calorimeters. (It causes many tracks abandoning).
+ // both hadronics and EM calorimeters.
gMC->Gspos("ZEM ", 1,"ALIC", fPosZEM[0], fPosZEM[1], fPosZEM[2]+fDimZEM[0], irot1, "ONLY");
// Second EM ZDC (same side w.r.t. IP, just on the other side w.r.t. beam pipe)
fMedSensF1 = idtmed[3]; // Sensitive volume: fibres type 1
fMedSensF2 = idtmed[4]; // Sensitive volume: fibres type 2
fMedSensZEM = idtmed[5]; // Sensitive volume: ZEM passive material
-// fMedSensTDI = idtmed[6]; // Sensitive volume: TDI Cu shield
-// fMedSensPI = idtmed[7]; // Sensitive volume: beam pipes
+ fMedSensTDI = idtmed[6]; // Sensitive volume: TDI Cu shield
+ fMedSensPI = idtmed[7]; // Sensitive volume: beam pipes
fMedSensGR = idtmed[12]; // Sensitive volume: air into the grooves
}
for (j=0;j<10;j++) hits[j]=0;
+ // --- This part is for no shower developement in beam pipe and TDI
+ // If particle interacts with beam pipe or TDI -> return
+ if((gMC->GetMedium() == fMedSensPI) || (gMC->GetMedium() == fMedSensTDI)){
+ // If option NoShower is set -> StopTrack
+ if(fNoShower==1) {
+ if(gMC->GetMedium() == fMedSensPI) {
+ knamed = gMC->CurrentVolName();
+ if((!strncmp(knamed,"MQ",2)) || (!strncmp(knamed,"YM",2))) fpLostIT += 1;
+ if((!strncmp(knamed,"MD1",3))|| (!strncmp(knamed,"YD1",2))) fpLostD1 += 1;
+ }
+ else if(gMC->GetMedium() == fMedSensTDI) fpLostTDI += 1;
+ gMC->StopTrack();
+ //printf("\n # of p lost in Inner Triplet = %d\n",fpLostIT);
+ //printf("\n # of p lost in D1 = %d\n",fpLostD1);
+ //printf("\n # of p lost in TDI = %d\n\n",fpLostTDI);
+ }
+ return;
+ }
+
if((gMC->GetMedium() == fMedSensZN) || (gMC->GetMedium() == fMedSensZP) ||
(gMC->GetMedium() == fMedSensGR) || (gMC->GetMedium() == fMedSensF1) ||
(gMC->GetMedium() == fMedSensF2) || (gMC->GetMedium() == fMedSensZEM)){
-// --- This part is for no shower developement in beam pipe and TDI
-// (gMC->GetMedium() == fMedSensPI) || (gMC->GetMedium() == fMedSensTDI)){
-
- // If particle interacts with beam pipe -> return
-// if((gMC->GetMedium() == fMedSensPI) || (gMC->GetMedium() == fMedSensTDI)){
- // If option NoShower is set -> StopTrack
-// if(fNoShower==1) {
-// if(gMC->GetMedium() == fMedSensPI) {
-// knamed = gMC->CurrentVolName();
-// if((!strncmp(knamed,"MQ",2)) || (!strncmp(knamed,"YM",2))) fpLostIT += 1;
-// if((!strncmp(knamed,"MD1",3))|| (!strncmp(knamed,"YD1",2))) fpLostD1 += 1;
-// }
-// if(gMC->GetMedium() == fMedSensTDI) fpLostTDI += 1;
-// gMC->StopTrack();
-// printf("\n # of p lost in Inner Triplet = %d\n",fpLostIT);
-// printf("\n # of p lost in D1 = %d\n",fpLostD1);
-// printf("\n # of p lost in TDI = %d\n",fpLostTDI);
-// }
-// return;
-// }
//Particle coordinates
gMC->TrackPosition(s);
// Int_t PcID = gMC->TrackPid();
// printf("Pc ID -> %d\n",PcID);
- AddHit(gAlice->CurrentTrack(), vol, hits);
+ AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
if(fNoShower==1){
-// fpDetected += 1;
+ fpDetected += 1;
gMC->StopTrack();
-// printf("\n # of detected p = %d\n",fpDetected);
+ //printf("\n # of detected p = %d\n\n",fpDetected);
return;
}
}
hits[9] = ekin;
hits[7] = 0.;
hits[8] = 0.;
- AddHit(gAlice->CurrentTrack(), vol, hits);
+ AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
}
else{
hits[9] = destep;
hits[7] = 0.;
hits[8] = 0.;
- AddHit(gAlice->CurrentTrack(), vol, hits);
+ AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
}
// printf(" Dep. E = %f \n",hits[9]);
}
hits[7] = nphe; //fLightPMQ
hits[8] = 0;
hits[9] = 0;
- AddHit(gAlice->CurrentTrack(), vol, hits);
+ AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
}
else{
hits[7] = 0;
hits[8] = nphe; //fLightPMC
hits[9] = 0;
- AddHit(gAlice->CurrentTrack(), vol, hits);
+ AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
}
}
else if((vol[0]==2)) { // (2) ZP fibres
hits[7] = nphe; //fLightPMQ
hits[8] = 0;
hits[9] = 0;
- AddHit(gAlice->CurrentTrack(), vol, hits);
+ AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
}
else{
hits[7] = 0;
hits[8] = nphe; //fLightPMC
hits[9] = 0;
- AddHit(gAlice->CurrentTrack(), vol, hits);
+ AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
}
}
else if((vol[0]==3)) { // (3) ZEM fibres
hits[7] = 0;
hits[8] = nphe; //fLightPMC (ZEM1)
hits[9] = 0;
- AddHit(gAlice->CurrentTrack(), vol, hits);
+ AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
}
else{
hits[7] = nphe; //fLightPMQ (ZEM2)
hits[8] = 0;
hits[9] = 0;
- AddHit(gAlice->CurrentTrack(), vol, hits);
+ AddHit(gAlice->GetMCApp()->GetCurrentTrackNumber(), vol, hits);
}
}
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff