From 2d0eca9678e16b40e7586587adca7a2db17fbc66 Mon Sep 17 00:00:00 2001 From: cblume Date: Thu, 22 Jan 2009 13:21:09 +0000 Subject: [PATCH] Clean up the dependencies --- TRD/AliTRD.cxx | 74 +----------------------------------------- TRD/AliTRD.h | 32 ++++-------------- TRD/AliTRDgeometry.cxx | 10 ++---- TRD/AliTRDgeometry.h | 9 ++--- 4 files changed, 13 insertions(+), 112 deletions(-) diff --git a/TRD/AliTRD.cxx b/TRD/AliTRD.cxx index 6af8d6efef8..020d9a86bc6 100644 --- a/TRD/AliTRD.cxx +++ b/TRD/AliTRD.cxx @@ -23,38 +23,19 @@ // // /////////////////////////////////////////////////////////////////////////////// -#include -#include - -#include -#include -#include -#include -#include -#include -#include #include -#include "AliConst.h" -#include "AliDigit.h" -#include "AliLoader.h" -#include "AliLog.h" #include "AliMC.h" #include "AliMagF.h" #include "AliRun.h" -#include "AliTrackReference.h" -#include "AliRawReader.h" #include "AliTRD.h" -#include "AliTRDdigit.h" #include "AliTRDdigitizer.h" #include "AliTRDdigitsManager.h" #include "AliTRDgeometry.h" #include "AliTRDhit.h" #include "AliTRDrawData.h" #include "AliTRDSimParam.h" -#include "AliTRDCommonParam.h" -#include "AliTRDcalibDB.h" ClassImp(AliTRD) @@ -65,8 +46,6 @@ AliTRD::AliTRD() ,fGasDensity(0) ,fFoilDensity(0) ,fGasNobleFraction(0) - ,fDrawTR(0) - ,fDisplayType(0) { // // Default constructor @@ -81,8 +60,6 @@ AliTRD::AliTRD(const char *name, const char *title) ,fGasDensity(0) ,fFoilDensity(0) ,fGasNobleFraction(0) - ,fDrawTR(0) - ,fDisplayType(0) { // // Standard constructor for the TRD @@ -327,7 +304,7 @@ void AliTRD::CreateGeometry() fGeometry->CreateGeometry(fIdtmed->GetArray() - 1299); } - + //_____________________________________________________________________________ void AliTRD::CreateMaterials() { @@ -534,55 +511,6 @@ void AliTRD::CreateMaterials() } } - -//_____________________________________________________________________________ -void AliTRD::DrawModule() const -{ - // - // Draw a shaded view of the Transition Radiation Detector version 0 - // - - // Set everything unseen - gMC->Gsatt("*" ,"SEEN",-1); - - // Set ALIC mother transparent - gMC->Gsatt("ALIC","SEEN", 0); - - // Set the volumes visible - if (fGeometry->IsVersion() == 0) { - gMC->Gsatt("B071","SEEN", 0); - gMC->Gsatt("B074","SEEN", 0); - gMC->Gsatt("B075","SEEN", 0); - gMC->Gsatt("B077","SEEN", 0); - gMC->Gsatt("BTR1","SEEN", 0); - gMC->Gsatt("BTR2","SEEN", 0); - gMC->Gsatt("BTR3","SEEN", 0); - gMC->Gsatt("UTR1","SEEN", 0); - gMC->Gsatt("UTR2","SEEN", 0); - gMC->Gsatt("UTR3","SEEN", 0); - } - else { - gMC->Gsatt("B071","SEEN", 0); - gMC->Gsatt("B074","SEEN", 0); - gMC->Gsatt("B075","SEEN", 0); - gMC->Gsatt("B077","SEEN", 0); - gMC->Gsatt("BTR1","SEEN", 0); - gMC->Gsatt("BTR2","SEEN", 0); - gMC->Gsatt("BTR3","SEEN", 0); - gMC->Gsatt("UTR1","SEEN", 0); - } - - gMC->Gdopt("hide", "on"); - gMC->Gdopt("shad", "on"); - gMC->Gsatt("*", "fill", 7); - gMC->SetClipBox("."); - gMC->SetClipBox("*", 0, 2000, -2000, 2000, -2000, 2000); - gMC->DefaultRange(); - gMC->Gdraw("alic", 40, 30, 0, 12, 9.4, .021, .021); - gMC->Gdhead(1111, "Transition Radiation Detector"); - gMC->Gdman(18, 4, "MAN"); - -} //_____________________________________________________________________________ void AliTRD::Init() diff --git a/TRD/AliTRD.h b/TRD/AliTRD.h index 7f63a74cbb1..49eafced5b2 100644 --- a/TRD/AliTRD.h +++ b/TRD/AliTRD.h @@ -11,22 +11,11 @@ // // //////////////////////////////////////////////////////////////////////////// -#include -#include #include "AliDetector.h" -#include "AliTRDTriggerL1.h" - -class TFile; -class TLorentzVector; - -class AliRun; -class AliDigit; class AliRawReader; -class AliTRDhit; -class AliTRDsim; class AliTRDgeometry; class AliTRD : public AliDetector { @@ -43,7 +32,6 @@ class AliTRD : public AliDetector { virtual void CreateGeometry(); virtual void CreateMaterials(); - virtual void DrawModule() const; virtual void Hits2Digits(); virtual void Hits2SDigits(); @@ -65,34 +53,28 @@ class AliTRD : public AliDetector { virtual void SetStepSize(Double_t s) = 0; virtual void SetHits() { }; - virtual void SetDrawTR(Int_t idraw = 1) { fDrawTR = idraw; }; - virtual void SetDisplayType(Int_t type = 0) { fDisplayType = type; }; virtual void SetTR(Bool_t ) = 0; virtual Bool_t GetTR() const = 0; - AliTRDgeometry *GetGeometry() const { return fGeometry; }; + AliTRDgeometry *GetGeometry() const { return fGeometry; }; virtual AliDigitizer *CreateDigitizer(AliRunDigitizer *manager) const; - virtual AliTRDTriggerL1 *CreateTriggerDetector() const { return new AliTRDTriggerL1(); }; - virtual AliLoader* MakeLoader(const char* topfoldername); + virtual AliLoader *MakeLoader(const char* topfoldername); protected: - AliTRDgeometry *fGeometry; // The TRD geometry - - Float_t fGasDensity; // The density of the drift gas - Float_t fFoilDensity; // The density of the entrance window foil - Float_t fGasNobleFraction; // The fraction of noble gas in the mixture + AliTRDgeometry *fGeometry; // The TRD geometry - Int_t fDrawTR; // Switches marking the TR photons in the display - Int_t fDisplayType; // Display type (0: normal, 1: detailed) + Float_t fGasDensity; // The density of the drift gas + Float_t fFoilDensity; // The density of the entrance window foil + Float_t fGasNobleFraction; // The fraction of noble gas in the mixture private: AliTRD(const AliTRD &trd); AliTRD &operator=(const AliTRD &trd); - ClassDef(AliTRD,10) // Transition Radiation Detector base class + ClassDef(AliTRD,11) // Transition Radiation Detector base class }; diff --git a/TRD/AliTRDgeometry.cxx b/TRD/AliTRDgeometry.cxx index 59375118a6a..05307cda73d 100644 --- a/TRD/AliTRDgeometry.cxx +++ b/TRD/AliTRDgeometry.cxx @@ -23,19 +23,13 @@ #include #include -#include +#include -#include "AliLog.h" -#include "AliRunLoader.h" -#include "AliAlignObj.h" #include "AliAlignObjParams.h" -#include "AliRun.h" -#include "AliTRD.h" #include "AliTRDcalibDB.h" #include "AliTRDgeometry.h" #include "AliTRDpadPlane.h" -#include "AliTRDCommonParam.h" ClassImp(AliTRDgeometry) @@ -2507,7 +2501,7 @@ void AliTRDgeometry::GroupChamber(Int_t ilayer, Int_t istack, Int_t *idtmed) xyzBoxd[i] = 0.5*(xyzMax[i]-xyzMin[i]); } - + sprintf(cTagM,"UT%02d",iDet); gMC->Gsvolu(cTagM,"BOX ",idtmed[1302-1],xyzBoxd,kNparCha); diff --git a/TRD/AliTRDgeometry.h b/TRD/AliTRDgeometry.h index 6680b7ee1f9..0116569bfd1 100644 --- a/TRD/AliTRDgeometry.h +++ b/TRD/AliTRDgeometry.h @@ -11,13 +11,11 @@ // // /////////////////////////////////////////////////////////////////////////////// -#include "AliGeometry.h" - #include "TObjArray.h" -class TGeoHMatrix; +#include "AliGeometry.h" -class AliRunLoader; +class TGeoHMatrix; class AliTRDpadPlane; @@ -221,8 +219,7 @@ class AliTRDgeometry : public AliGeometry { Char_t fSMstatus[kNsector]; // Super module status byte - ClassDef(AliTRDgeometry,19) // TRD geometry class + ClassDef(AliTRDgeometry,20) // TRD geometry class }; - #endif -- 2.43.0