From e04976bdcfe09230508c37ed2b82d3ef71a33df0 Mon Sep 17 00:00:00 2001 From: schutz Date: Fri, 4 Aug 2000 12:30:55 +0000 Subject: [PATCH] Added virtual IsVersion. Print of version defered to Init in AliPHOS --- PHOS/AliPHOSv0.cxx | 16 +++++++++------- PHOS/AliPHOSv0.h | 2 +- PHOS/AliPHOSv1.cxx | 5 ++--- PHOS/AliPHOSv1.h | 5 ++++- PHOS/AliPHOSv2.cxx | 3 ++- PHOS/AliPHOSv2.h | 10 +++++++++- PHOS/AliPHOSv3.cxx | 5 +++-- PHOS/AliPHOSv3.h | 11 +++++++++-- PHOS/AliPHOSv4.cxx | 10 +--------- PHOS/AliPHOSv4.h | 2 +- 10 files changed, 41 insertions(+), 28 deletions(-) diff --git a/PHOS/AliPHOSv0.cxx b/PHOS/AliPHOSv0.cxx index 6683a1b7f79..eea59f33c62 100644 --- a/PHOS/AliPHOSv0.cxx +++ b/PHOS/AliPHOSv0.cxx @@ -54,13 +54,10 @@ AliPHOSv0::AliPHOSv0(const char *name, const char *title): // GPS2 = 5 modules (EMC + PPSD) // gets an instance of the geometry parameters class - - if (strcmp(title,"") != 0 ) - fGeom = AliPHOSGeometry::GetInstance(title, "") ; - if (fGeom!=0) - cout << "AliPHOS" << Version() << " : PHOS geometry intialized for " << fGeom->GetName() << endl ; - else - cout << "AliPHOS" << Version() << " : PHOS geometry initialization failed !" << endl ; + + if (strcmp(GetTitle(),"") != 0 ) + fGeom = AliPHOSGeometry::GetInstance(GetTitle(), "") ; + } //____________________________________________________________________________ @@ -1009,6 +1006,11 @@ void AliPHOSv0::Init(void) // Here the PHOS initialisation code (if any!) + if (fGeom!=0) + cout << "AliPHOS" << Version() << " : PHOS geometry intialized for " << fGeom->GetName() << endl ; + else + cout << "AliPHOS" << Version() << " : PHOS geometry initialization failed !" << endl ; + for(i=0;i<80;i++) printf("*"); printf("\n"); diff --git a/PHOS/AliPHOSv0.h b/PHOS/AliPHOSv0.h index c4ff23510dc..e19aed6ad34 100644 --- a/PHOS/AliPHOSv0.h +++ b/PHOS/AliPHOSv0.h @@ -52,7 +52,7 @@ class AliPHOSv0 : public AliPHOS { return fGeom ; } virtual void Init(void) ; // does nothing - Int_t IsVersion(void) const { + virtual Int_t IsVersion(void) const { // Gives the version number return 0 ; } diff --git a/PHOS/AliPHOSv1.cxx b/PHOS/AliPHOSv1.cxx index 3ecbd75dca4..fb293e4f340 100644 --- a/PHOS/AliPHOSv1.cxx +++ b/PHOS/AliPHOSv1.cxx @@ -57,7 +57,7 @@ AliPHOSv1::AliPHOSv1() //____________________________________________________________________________ AliPHOSv1::AliPHOSv1(const char *name, const char *title): - AliPHOSv0(name,title) +AliPHOSv0(name,title) { // ctor : title is used to identify the layout // GPS2 = 5 modules (EMC + PPSD) @@ -86,7 +86,7 @@ AliPHOSv1::AliPHOSv1(const char *name, const char *title): fIshunt = 1 ; // All hits are associated with primary particles - + } //____________________________________________________________________________ @@ -128,7 +128,6 @@ AliPHOSv1::AliPHOSv1(AliPHOSReconstructioner * Reconstructioner, const char *nam fReconstructioner = Reconstructioner ; - } //____________________________________________________________________________ diff --git a/PHOS/AliPHOSv1.h b/PHOS/AliPHOSv1.h index 6d547b00cd2..864d649c0aa 100644 --- a/PHOS/AliPHOSv1.h +++ b/PHOS/AliPHOSv1.h @@ -36,7 +36,10 @@ public: virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) ; Int_t Digitize(Float_t Energy); virtual void FinishEvent(void) ; - Int_t IsVersion(void) const { return 1 ; } + virtual Int_t IsVersion(void) const { + // Gives the version number + return 1 ; + } virtual void MakeBranch(Option_t* opt) ; virtual AliPHOSRecPoint::RecPointsList * PpsdRecPoints() { // Getting list of PPSD RecPoints diff --git a/PHOS/AliPHOSv2.cxx b/PHOS/AliPHOSv2.cxx index 8ff961fbb98..91af00ff373 100644 --- a/PHOS/AliPHOSv2.cxx +++ b/PHOS/AliPHOSv2.cxx @@ -55,9 +55,10 @@ AliPHOSv2::AliPHOSv2() //____________________________________________________________________________ AliPHOSv2::AliPHOSv2(const char *name, const char *title): - AliPHOSv1(name,title) +AliPHOSv1(name,title) { // ctor + fHits= new TClonesArray("AliPHOSHit",1000) ; } diff --git a/PHOS/AliPHOSv2.h b/PHOS/AliPHOSv2.h index e811c9853fd..c21d39d3d2a 100644 --- a/PHOS/AliPHOSv2.h +++ b/PHOS/AliPHOSv2.h @@ -23,7 +23,15 @@ public: AliPHOSv2(const char *name, const char *title="") ; virtual ~AliPHOSv2(void) ; - virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) ; + virtual void AddHit( Int_t shunt, Int_t primary, Int_t track, Int_t id, Float_t *hits ) ; + virtual Int_t IsVersion(void) const { + // Gives the version number + return 2 ; + } + virtual TString Version(void){ + // returns the version number + return TString("v2") ; + } protected: diff --git a/PHOS/AliPHOSv3.cxx b/PHOS/AliPHOSv3.cxx index 0568a0b254d..ac85d4eeb0f 100644 --- a/PHOS/AliPHOSv3.cxx +++ b/PHOS/AliPHOSv3.cxx @@ -48,8 +48,8 @@ ClassImp(AliPHOSv3) //____________________________________________________________________________ -AliPHOSv3::AliPHOSv3(const char *name, const char *title): - AliPHOSv1(name,title) + AliPHOSv3::AliPHOSv3(const char *name, const char *title): +AliPHOSv1(name,title) { // ctor @@ -62,6 +62,7 @@ AliPHOSv3::AliPHOSv3(const char *name, const char *title): // PINEfficiency is 0.1875 from Odd Harald Odland work // k_0 is 0.0045 from Valery Antonenko + fLightYieldMean = 700000. ; fIntrinsicPINEfficiency = 0.1875 ; fLightYieldAttenuation = 0.0045 ; diff --git a/PHOS/AliPHOSv3.h b/PHOS/AliPHOSv3.h index 1c45ec8baf0..6117149e510 100644 --- a/PHOS/AliPHOSv3.h +++ b/PHOS/AliPHOSv3.h @@ -34,8 +34,15 @@ public: // dtor } - virtual void StepManager(void) ; // does the tracking through PHOS and a preliminary digitalization - + virtual Int_t IsVersion(void) const { + // Gives the version number + return 3 ; + } + virtual TString Version(void){ + // returns the version number + return TString("v3") ; + } + virtual void StepManager(void) ; private: diff --git a/PHOS/AliPHOSv4.cxx b/PHOS/AliPHOSv4.cxx index f262098e2da..aa42bfb5652 100644 --- a/PHOS/AliPHOSv4.cxx +++ b/PHOS/AliPHOSv4.cxx @@ -49,12 +49,7 @@ AliPHOSv4::AliPHOSv4(const char *name, const char *title): // ctor // gets an instance of the geometry parameters class - - if ( strcmp(title, "") != 0 ) - fGeom = AliPHOSGeometry::GetInstance(title, "") ; - - if (fGeom != 0 ) { - cout << "AliPHOSv4 : PHOS geometry intialized for " << fGeom->GetName() << endl ; + SetBigBox(0, fGeom->GetOuterBoxSize(0) ) ; SetBigBox(1, fGeom->GetOuterBoxSize(1) + fGeom->GetPPSDBoxSize(1) ) ; @@ -72,9 +67,6 @@ AliPHOSv4::AliPHOSv4(const char *name, const char *title): fPosParaB0 = 0.257 ; fPosParaB1 = 0.137 ; fPosParaB2 = 0.00619 ; - } - else - cout << "AliPHOSv4 : PHOS geometry initialization failed !" << endl ; } //____________________________________________________________________________ diff --git a/PHOS/AliPHOSv4.h b/PHOS/AliPHOSv4.h index a6d1380d566..fb5be99bc3b 100644 --- a/PHOS/AliPHOSv4.h +++ b/PHOS/AliPHOSv4.h @@ -49,7 +49,7 @@ public: return fGeom ; } virtual void Init(void) ; // does nothing - Int_t IsVersion(void) const { + virtual Int_t IsVersion(void) const { // Gives the version number return 4 ; } -- 2.43.0