From 43da34c0301970b778a872d4c2209dfe735823cb Mon Sep 17 00:00:00 2001 From: cblume Date: Tue, 27 Jun 2000 13:08:50 +0000 Subject: [PATCH] Changed to Copy(TObject &A) to appease the HP-compiler --- TRD/AliTRDclusterizerV1.cxx | 13 ++++++++----- TRD/AliTRDclusterizerV1.h | 2 +- TRD/AliTRDdataArrayF.cxx | 9 ++++++--- TRD/AliTRDdataArrayF.h | 2 +- TRD/AliTRDdataArrayI.cxx | 9 ++++++--- TRD/AliTRDdataArrayI.h | 2 +- TRD/AliTRDsegmentArray.cxx | 5 ++++- TRD/AliTRDsegmentArray.h | 2 +- TRD/AliTRDv1.cxx | 25 ++++++++++++++----------- TRD/AliTRDv1.h | 2 +- 10 files changed, 43 insertions(+), 28 deletions(-) diff --git a/TRD/AliTRDclusterizerV1.cxx b/TRD/AliTRDclusterizerV1.cxx index aa6d9bff896..8fd7c711ee4 100644 --- a/TRD/AliTRDclusterizerV1.cxx +++ b/TRD/AliTRDclusterizerV1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.6 2000/06/09 11:10:07 cblume +Compiler warnings and coding conventions, next round + Revision 1.5 2000/06/08 18:32:58 cblume Make code compliant to coding conventions @@ -111,16 +114,16 @@ AliTRDclusterizerV1 &AliTRDclusterizerV1::operator=(const AliTRDclusterizerV1 &c } //_____________________________________________________________________________ -void AliTRDclusterizerV1::Copy(AliTRDclusterizerV1 &c) +void AliTRDclusterizerV1::Copy(TObject &c) { // // Copy function // - c.fClusMaxThresh = fClusMaxThresh; - c.fClusSigThresh = fClusSigThresh; - c.fClusMethod = fClusMethod; - c.fDigitsManager = NULL; + ((AliTRDclusterizerV1 &) c).fClusMaxThresh = fClusMaxThresh; + ((AliTRDclusterizerV1 &) c).fClusSigThresh = fClusSigThresh; + ((AliTRDclusterizerV1 &) c).fClusMethod = fClusMethod; + ((AliTRDclusterizerV1 &) c).fDigitsManager = NULL; AliTRDclusterizer::Copy(c); diff --git a/TRD/AliTRDclusterizerV1.h b/TRD/AliTRDclusterizerV1.h index e638440b6ec..3ebea4584be 100644 --- a/TRD/AliTRDclusterizerV1.h +++ b/TRD/AliTRDclusterizerV1.h @@ -23,7 +23,7 @@ class AliTRDclusterizerV1 : public AliTRDclusterizer { virtual ~AliTRDclusterizerV1(); AliTRDclusterizerV1 &operator=(const AliTRDclusterizerV1 &c); - virtual void Copy(AliTRDclusterizerV1 &c); + virtual void Copy(TObject &c); virtual void Init(); virtual Bool_t MakeCluster(); virtual Bool_t ReadDigits(); diff --git a/TRD/AliTRDdataArrayF.cxx b/TRD/AliTRDdataArrayF.cxx index 1037942dd99..e352f663817 100644 --- a/TRD/AliTRDdataArrayF.cxx +++ b/TRD/AliTRDdataArrayF.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2000/06/09 11:10:07 cblume +Compiler warnings and coding conventions, next round + Revision 1.3 2000/06/08 18:32:58 cblume Make code compliant to coding conventions @@ -102,15 +105,15 @@ void AliTRDdataArrayF::Allocate(Int_t nrow, Int_t ncol, Int_t ntime) } //_____________________________________________________________________________ -void AliTRDdataArrayF::Copy(AliTRDdataArrayF &a) +void AliTRDdataArrayF::Copy(TObject &a) { // // Copy function // - fElements->Copy(*a.fElements); + fElements->Copy(*((AliTRDdataArrayF &) a).fElements); - a.fThreshold = fThreshold; + ((AliTRDdataArrayF &) a).fThreshold = fThreshold; AliTRDdataArray::Copy(a); diff --git a/TRD/AliTRDdataArrayF.h b/TRD/AliTRDdataArrayF.h index 1fc662bc6bf..5be7dca8927 100644 --- a/TRD/AliTRDdataArrayF.h +++ b/TRD/AliTRDdataArrayF.h @@ -27,7 +27,7 @@ class AliTRDdataArrayF : public AliTRDdataArray { AliTRDdataArrayF &operator=(const AliTRDdataArrayF &a); virtual void Allocate(Int_t nrow, Int_t ncol,Int_t ntime); - virtual void Copy(AliTRDdataArrayF &a); + virtual void Copy(TObject &a); virtual void Compress(Int_t bufferType, Float_t threshold); virtual void Compress(Int_t bufferType); virtual void Expand(); diff --git a/TRD/AliTRDdataArrayI.cxx b/TRD/AliTRDdataArrayI.cxx index dec9059ab0c..e9e007f3544 100644 --- a/TRD/AliTRDdataArrayI.cxx +++ b/TRD/AliTRDdataArrayI.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2000/06/09 11:10:07 cblume +Compiler warnings and coding conventions, next round + Revision 1.3 2000/06/08 18:32:58 cblume Make code compliant to coding conventions @@ -101,15 +104,15 @@ void AliTRDdataArrayI::Allocate(Int_t nrow, Int_t ncol, Int_t ntime) } //_____________________________________________________________________________ -void AliTRDdataArrayI::Copy(AliTRDdataArrayI &a) +void AliTRDdataArrayI::Copy(TObject &a) { // // Copy function // - fElements->Copy(*a.fElements); + fElements->Copy(*((AliTRDdataArrayI &) a).fElements); - a.fThreshold = fThreshold; + ((AliTRDdataArrayI &) a).fThreshold = fThreshold; AliTRDdataArray::Copy(a); diff --git a/TRD/AliTRDdataArrayI.h b/TRD/AliTRDdataArrayI.h index 8335e02f1b6..157efd373ea 100644 --- a/TRD/AliTRDdataArrayI.h +++ b/TRD/AliTRDdataArrayI.h @@ -27,7 +27,7 @@ class AliTRDdataArrayI : public AliTRDdataArray { AliTRDdataArrayI &operator=(const AliTRDdataArrayI &a); virtual void Allocate(Int_t nrow, Int_t ncol, Int_t ntime); - virtual void Copy(AliTRDdataArrayI &a); + virtual void Copy(TObject &a); virtual void Compress(Int_t bufferType, Int_t threshold); virtual void Compress(Int_t bufferType); virtual void Expand(); diff --git a/TRD/AliTRDsegmentArray.cxx b/TRD/AliTRDsegmentArray.cxx index f2d8d999f36..401f49b9f0a 100644 --- a/TRD/AliTRDsegmentArray.cxx +++ b/TRD/AliTRDsegmentArray.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.3 2000/06/08 18:32:58 cblume +Make code compliant to coding conventions + Revision 1.2 2000/05/08 16:17:27 cblume Merge TRD-develop @@ -83,7 +86,7 @@ AliTRDsegmentArray::~AliTRDsegmentArray() } //_____________________________________________________________________________ -void AliTRDsegmentArray::Copy(AliTRDsegmentArray &a) +void AliTRDsegmentArray::Copy(TObject &a) { // // Copy function diff --git a/TRD/AliTRDsegmentArray.h b/TRD/AliTRDsegmentArray.h index 5d290441fa6..f8cf5ca3cba 100644 --- a/TRD/AliTRDsegmentArray.h +++ b/TRD/AliTRDsegmentArray.h @@ -22,7 +22,7 @@ class AliTRDsegmentArray : public AliTRDsegmentArrayBase { AliTRDsegmentArray(AliTRDsegmentArray &a); virtual ~AliTRDsegmentArray(); - virtual void Copy(AliTRDsegmentArray &a); + virtual void Copy(TObject &a); virtual void Delete(); virtual void Delete(const char *) { Delete(); }; diff --git a/TRD/AliTRDv1.cxx b/TRD/AliTRDv1.cxx index ef1c8299d0d..0d56cd7221b 100644 --- a/TRD/AliTRDv1.cxx +++ b/TRD/AliTRDv1.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.21 2000/06/09 11:10:07 cblume +Compiler warnings and coding conventions, next round + Revision 1.20 2000/06/08 18:32:58 cblume Make code compliant to coding conventions @@ -168,25 +171,25 @@ AliTRDv1 &AliTRDv1::operator=(const AliTRDv1 &trd) } //_____________________________________________________________________________ -void AliTRDv1::Copy(AliTRDv1 &trd) +void AliTRDv1::Copy(TObject &trd) { // // Copy function // - trd.fIdSens = fIdSens; + ((AliTRDv1 &) trd).fIdSens = fIdSens; - trd.fIdChamber1 = fIdChamber1; - trd.fIdChamber2 = fIdChamber2; - trd.fIdChamber3 = fIdChamber3; + ((AliTRDv1 &) trd).fIdChamber1 = fIdChamber1; + ((AliTRDv1 &) trd).fIdChamber2 = fIdChamber2; + ((AliTRDv1 &) trd).fIdChamber3 = fIdChamber3; - trd.fSensSelect = fSensSelect; - trd.fSensPlane = fSensPlane; - trd.fSensChamber = fSensChamber; - trd.fSensSector = fSensSector; - trd.fSensSectorRange = fSensSectorRange; + ((AliTRDv1 &) trd).fSensSelect = fSensSelect; + ((AliTRDv1 &) trd).fSensPlane = fSensPlane; + ((AliTRDv1 &) trd).fSensChamber = fSensChamber; + ((AliTRDv1 &) trd).fSensSector = fSensSector; + ((AliTRDv1 &) trd).fSensSectorRange = fSensSectorRange; - trd.fDeltaE = NULL; + ((AliTRDv1 &) trd).fDeltaE = NULL; } diff --git a/TRD/AliTRDv1.h b/TRD/AliTRDv1.h index bbd3dfc19ea..2745ecb8667 100644 --- a/TRD/AliTRDv1.h +++ b/TRD/AliTRDv1.h @@ -27,7 +27,7 @@ class AliTRDv1 : public AliTRD { virtual ~AliTRDv1(); AliTRDv1 &operator=(const AliTRDv1 &trd); - virtual void Copy(AliTRDv1 &trd); + virtual void Copy(TObject &trd); virtual void CreateGeometry(); virtual void CreateMaterials(); virtual Int_t IsVersion() const { return 1; }; -- 2.39.3