From 1f7f8a9cf151a7e5e386684460bb575f8f7b60f7 Mon Sep 17 00:00:00 2001 From: hristov Date: Thu, 19 May 2011 09:05:58 +0000 Subject: [PATCH] Reverting change 49889 --- PMD/AliPMDv1.cxx | 35 +++++++++++++++++++++++++++++++++-- PMD/AliPMDv1.h | 45 ++++++++++++++++++++++----------------------- PMD/AliPMDv2008.cxx | 25 +++++++++++++++++++++++-- PMD/AliPMDv2008.h | 45 +++++++++++++++++++++++---------------------- 4 files changed, 101 insertions(+), 49 deletions(-) diff --git a/PMD/AliPMDv1.cxx b/PMD/AliPMDv1.cxx index b80d8fa33c0..0f9e2fb640d 100644 --- a/PMD/AliPMDv1.cxx +++ b/PMD/AliPMDv1.cxx @@ -17,6 +17,19 @@ // /////////////////////////////////////////////////////////////////////////////// // // +// Photon Multiplicity Detector Version 1 // +// Bedanga Mohanty : February 14th 2006 +//--------------------------------------------------- +// ALICE PMD FEE BOARDS IMPLEMENTATION +// Dt: 25th February 2006 +// M.M. Mondal, S.K. Prasad and P.K. Netrakanti +//--------------------------------------------------- +// Create final detector from Unit Modules +// Author : Bedanga and Viyogi June 2003 +//--------------------------------------------------- +// Modified by +// Dr. Y.P. Viyogi and Ranbir Singh +// Dt: 2nd February 2009 // //Begin_Html /* @@ -40,6 +53,25 @@ #include "AliRun.h" #include "AliTrackReference.h" +const Int_t AliPMDv1::fgkNcolUM1 = 48; // Number of cols in UM, type 1 +const Int_t AliPMDv1::fgkNcolUM2 = 96; // Number of cols in UM, type 2 +const Int_t AliPMDv1::fgkNrowUM1 = 96; // Number of rows in UM, type 1 +const Int_t AliPMDv1::fgkNrowUM2 = 48; // Number of rows in UM, type 2 +const Float_t AliPMDv1::fgkCellRadius = 0.25; // Radius of a hexagonal cell +const Float_t AliPMDv1::fgkCellWall = 0.02; // Thickness of cell Wall +const Float_t AliPMDv1::fgkCellDepth = 0.50; // Gas thickness +const Float_t AliPMDv1::fgkThPCB = 0.16; // Thickness of PCB +const Float_t AliPMDv1::fgkThLead = 1.5; // Thickness of Pb +const Float_t AliPMDv1::fgkThSteel = 0.5; // Thickness of Steel +const Float_t AliPMDv1::fgkGap = 0.025; // Air Gap +const Float_t AliPMDv1::fgkZdist = 361.5; // z-position of the detector +const Float_t AliPMDv1::fgkSqroot3 = 1.7320508;// Square Root of 3 +const Float_t AliPMDv1::fgkSqroot3by2 = 0.8660254;// Square Root of 3 by 2 +const Float_t AliPMDv1::fgkSSBoundary = 0.3; +const Float_t AliPMDv1::fgkThSS = 1.23; // Old thickness of SS frame was 1.03 +const Float_t AliPMDv1::fgkThTopG10 = 0.33; +const Float_t AliPMDv1::fgkThBotG10 = 0.4; + ClassImp(AliPMDv1) @@ -2319,8 +2351,7 @@ void AliPMDv1::AddAlignableVolumes() const // ---------------------------------------------------------------- void AliPMDv1::SetSectorAlignable() const { - // To align each sector - // Each plane has four sectors + // TString vpsector = "ALIC_1/EPM"; TString vpappend = "_1"; diff --git a/PMD/AliPMDv1.h b/PMD/AliPMDv1.h index 3163b4e19da..1fd082fd8e1 100644 --- a/PMD/AliPMDv1.h +++ b/PMD/AliPMDv1.h @@ -4,15 +4,14 @@ * See cxx source for full Copyright notice */ /* $Id$ */ +// Rectangular geometry - Bedanga Mohanty - Spetember 2003 ///////////////////////////////////////////////// // Manager and hits classes for set:PMD // //////////////////////////////////////////////// - -class TGeoManager; #include "AliPMD.h" - +#include "TGeoManager.h" //___________________________________________ class AliPMDv1 : public AliPMD { @@ -37,26 +36,26 @@ public: private: - static const Int_t fgkNcolUM1 = 48; // Number of cols in UM, type 1 - static const Int_t fgkNcolUM2 = 96; // Number of cols in UM, type 2 - static const Int_t fgkNrowUM1 = 96; // Number of rows in UM, type 1 - static const Int_t fgkNrowUM2 = 48; // Number of rows in UM, type 2 - static const Float_t fgkCellRadius = 0.25; // Radius of a hexagonal cell - static const Float_t fgkCellWall = 0.02; // Thickness of cell Wall - static const Float_t fgkCellDepth = 0.50; // Gas thickness - static const Float_t fgkThPCB = 0.16; // Thickness of PCB - static const Float_t fgkThLead = 1.5; // Thickness of Pb - static const Float_t fgkThSteel = 0.5; // Thickness of Steel - static const Float_t fgkGap = 0.025; // Air Gap - static const Float_t fgkZdist = 361.5; // z-position of the detector - static const Float_t fgkSqroot3 = 1.7320508; // Square Root of 3 - static const Float_t fgkSqroot3by2 = 0.8660254; // Square Root of 3 by 2 - static const Float_t fgkSSBoundary = 0.3; // Stainless steel boundary - static const Float_t fgkThSS = 1.23; // thickness of SS frame - static const Float_t fgkThTopG10 = 0.33; // top G10 material thickness - static const Float_t fgkThBotG10 = 0.4; // bottom G10 material thickness + static const Int_t fgkNcolUM1; // Number of cols in UM, type 1 + static const Int_t fgkNcolUM2; // Number of cols in UM, type 2 + static const Int_t fgkNrowUM1; // Number of rows in UM, type 1 + static const Int_t fgkNrowUM2; // Number of rows in UM, type 2 + static const Float_t fgkCellRadius; // Radius of a hexagonal cell + static const Float_t fgkCellWall; // Thickness of cell Wall + static const Float_t fgkCellDepth; // Gas thickness + static const Float_t fgkThPCB; // Thickness of PCB + static const Float_t fgkThLead; // Thickness of Pb + static const Float_t fgkThSteel; // Thickness of Steel + static const Float_t fgkGap; // Air Gap + static const Float_t fgkZdist; // z-position of the detector + static const Float_t fgkSqroot3; // Square Root of 3 + static const Float_t fgkSqroot3by2; // Square Root of 3 by 2 + static const Float_t fgkSSBoundary; + static const Float_t fgkThSS ; + static const Float_t fgkThTopG10; + static const Float_t fgkThBotG10; - Int_t fModStatus[48]; // To position different modules + Int_t fModStatus[48]; Float_t fSMthick; // Thickness of the full PMD profile Float_t fSMthickpmd; // Thickness of the PMD detector only @@ -72,7 +71,7 @@ private: Float_t fDboxmm22[3]; // Master MODULE EMCB of aluminum for CPV - ClassDef(AliPMDv1,5) //Hits manager for set:PMD + ClassDef(AliPMDv1,4) //Hits manager for set:PMD }; #endif diff --git a/PMD/AliPMDv2008.cxx b/PMD/AliPMDv2008.cxx index 5617fd34773..b365f4fa980 100644 --- a/PMD/AliPMDv2008.cxx +++ b/PMD/AliPMDv2008.cxx @@ -17,6 +17,8 @@ // /////////////////////////////////////////////////////////////////////////////// // // +// Photon Multiplicity Detector Version 1 // +// Bedanga Mohanty : February 14th 2006 // // //Begin_Html /* @@ -39,6 +41,26 @@ #include "AliPMDv2008.h" #include "AliRun.h" +const Int_t AliPMDv2008::fgkNcolUM1 = 48; // Number of cols in UM, type 1 +const Int_t AliPMDv2008::fgkNcolUM2 = 96; // Number of cols in UM, type 2 +const Int_t AliPMDv2008::fgkNrowUM1 = 96; // Number of rows in UM, type 1 +const Int_t AliPMDv2008::fgkNrowUM2 = 48; // Number of rows in UM, type 2 +const Float_t AliPMDv2008::fgkCellRadius = 0.25; // Radius of a hexagonal cell +const Float_t AliPMDv2008::fgkCellWall = 0.02; // Thickness of cell Wall +const Float_t AliPMDv2008::fgkCellDepth = 0.50; // Gas thickness +const Float_t AliPMDv2008::fgkThBase = 0.2; // Thickness of Base plate +const Float_t AliPMDv2008::fgkThBKP = 0.1; // Thickness of Back plane +const Float_t AliPMDv2008::fgkThAir = 1.03; // Thickness of Air +const Float_t AliPMDv2008::fgkThPCB = 0.16; // Thickness of PCB +const Float_t AliPMDv2008::fgkThLead = 1.5; // Thickness of Pb +const Float_t AliPMDv2008::fgkThSteel = 0.5; // Thickness of Steel +const Float_t AliPMDv2008::fgkGap = 0.025; // Air Gap +const Float_t AliPMDv2008::fgkZdist = 361.5; // z-position of the detector +const Float_t AliPMDv2008::fgkSqroot3 = 1.7320508;// Square Root of 3 +const Float_t AliPMDv2008::fgkSqroot3by2 = 0.8660254;// Square Root of 3 by 2 +const Float_t AliPMDv2008::fgkSSBoundary = 0.3; +const Float_t AliPMDv2008::fgkThSS = 1.03; +const Float_t AliPMDv2008::fgkThG10 = 1.03; ClassImp(AliPMDv2008) //_____________________________________________________________________________ @@ -1561,8 +1583,7 @@ void AliPMDv2008::AddAlignableVolumes() const // ---------------------------------------------------------------- void AliPMDv2008::SetSectorAlignable() const { - // To align each sector - // Each plane has four sectors + // TString vpsector = "ALIC_1/EPM"; TString vpappend = "_1"; diff --git a/PMD/AliPMDv2008.h b/PMD/AliPMDv2008.h index b37c8362cee..3e1db597bfa 100644 --- a/PMD/AliPMDv2008.h +++ b/PMD/AliPMDv2008.h @@ -4,13 +4,14 @@ * See cxx source for full Copyright notice */ /* $Id: AliPMDv1.h 15401 2006-10-18 18:49:59Z bnandi $ */ +// Rectangular geometry - Bedanga Mohanty - Spetember 2003 //////////////////////////////////////////////// // Manager and hits classes for set:PMD // //////////////////////////////////////////////// #include "AliPMD.h" -class TGeoManager; +#include "TGeoManager.h" //___________________________________________ class AliPMDv2008 : public AliPMD { @@ -32,26 +33,26 @@ public: private: - static const Int_t fgkNcolUM1 = 48; // Number of cols in UM, type 1 - static const Int_t fgkNcolUM2 = 96; // Number of cols in UM, type 2 - static const Int_t fgkNrowUM1 = 96; // Number of rows in UM, type 1 - static const Int_t fgkNrowUM2 = 48; // Number of rows in UM, type 2 - static const Float_t fgkCellRadius = 0.25; // Radius of a hexagonal cell - static const Float_t fgkCellWall = 0.02; // Thickness of cell Wall - static const Float_t fgkCellDepth = 0.50; // Gas thickness - static const Float_t fgkThBKP = 0.1; // Thickness of Back plane - static const Float_t fgkThBase = 0.2; // Thickness of Base plate - static const Float_t fgkThAir = 1.03; // Thickness of Air - static const Float_t fgkThPCB = 0.16; // Thickness of PCB - static const Float_t fgkThLead = 1.5; // Thickness of Pb - static const Float_t fgkThSteel = 0.5; // Thickness of Steel - static const Float_t fgkGap = 0.025; // Air Gap - static const Float_t fgkZdist = 361.5; // z-position of the detector - static const Float_t fgkSqroot3 = 1.7320508; // Square Root of 3 - static const Float_t fgkSqroot3by2 = 0.8660254; // Square Root of 3 by 2 - static const Float_t fgkSSBoundary = 0.3; // Stainless steel boundary - static const Float_t fgkThSS = 1.23; // thickness of SS frame - static const Float_t fgkThG10 = 1.03; // top G10 material thickness + static const Int_t fgkNcolUM1; // Number of cols in UM, type 1 + static const Int_t fgkNcolUM2; // Number of cols in UM, type 2 + static const Int_t fgkNrowUM1; // Number of rows in UM, type 1 + static const Int_t fgkNrowUM2; // Number of rows in UM, type 2 + static const Float_t fgkCellRadius; // Radius of a hexagonal cell + static const Float_t fgkCellWall; // Thickness of cell Wall + static const Float_t fgkCellDepth; // Gas thickness + static const Float_t fgkThBKP; // Thickness of Back plane + static const Float_t fgkThBase; // Thickness of Base plate + static const Float_t fgkThAir; // Thickness of Air + static const Float_t fgkThPCB; // Thickness of PCB + static const Float_t fgkThLead; // Thickness of Pb + static const Float_t fgkThSteel; // Thickness of Steel + static const Float_t fgkGap; // Air Gap + static const Float_t fgkZdist; // z-position of the detector + static const Float_t fgkSqroot3; // Square Root of 3 + static const Float_t fgkSqroot3by2; // Square Root of 3 by 2 + static const Float_t fgkSSBoundary; + static const Float_t fgkThSS ; + static const Float_t fgkThG10 ; Float_t fSMthick; // Thickness of the supermodule @@ -66,7 +67,7 @@ private: Float_t fDboxmm2[3]; // Master MODULE EMPB of aluminum for PMD Float_t fDboxmm22[3]; // Master MODULE EMCB of aluminum for CPV - ClassDef(AliPMDv2008,1) //Hits manager for set:PMD + ClassDef(AliPMDv2008,0) //Hits manager for set:PMD }; #endif -- 2.43.0