From 8c343c7cbf9e28c9c102c12caf82e39281c605b4 Mon Sep 17 00:00:00 2001 From: martinez Date: Tue, 19 Oct 2004 14:30:30 +0000 Subject: [PATCH] Logging of Debug, Info and Error Messages follwing AliRoot Standard http://aliweb.cern.ch/people/tkuhr/MessageLogging.html (Raphael) --- MUON/AliMUON.cxx | 24 +++--- MUON/AliMUONChamber.cxx | 7 +- MUON/AliMUONChamberGeometry.cxx | 7 +- MUON/AliMUONChamberTrigger.cxx | 2 +- MUON/AliMUONClusterFinderAZ.cxx | 8 +- MUON/AliMUONClusterFinderVS.cxx | 45 ++++------ MUON/AliMUONClusterInput.cxx | 5 +- MUON/AliMUONClusterReconstructor.cxx | 13 ++- MUON/AliMUONConstants.cxx | 1 - MUON/AliMUONDDLTracker.cxx | 2 +- MUON/AliMUONDDLTrigger.cxx | 2 +- MUON/AliMUONData.cxx | 57 ++++++------ MUON/AliMUONDataInterface.cxx | 75 ++++++++-------- MUON/AliMUONDigit.cxx | 1 + MUON/AliMUONDigitizer.cxx | 91 +++++++++----------- MUON/AliMUONDigitizerv1.cxx | 51 +++++------ MUON/AliMUONDigitizerv2.cxx | 24 ++---- MUON/AliMUONDisplay.cxx | 5 +- MUON/AliMUONEventReconstructor.cxx | 25 +++--- MUON/AliMUONFactory.cxx | 17 ++-- MUON/AliMUONGeometryBuilder.cxx | 9 +- MUON/AliMUONGeometryConstituent.cxx | 7 +- MUON/AliMUONGeometryEnvelope.cxx | 7 +- MUON/AliMUONGeometryEnvelopeStore.cxx | 17 ++-- MUON/AliMUONGeometrySVMap.cxx | 15 ++-- MUON/AliMUONGeometryTransformStore.cxx | 13 ++- MUON/AliMUONGlobalTrigger.cxx | 3 +- MUON/AliMUONHitForRec.cxx | 5 +- MUON/AliMUONHitMapA1.cxx | 5 +- MUON/AliMUONLoader.cxx | 5 +- MUON/AliMUONMerger.cxx | 3 +- MUON/AliMUONPadHit.cxx | 1 - MUON/AliMUONPoints.cxx | 5 +- MUON/AliMUONRawData.cxx | 7 +- MUON/AliMUONRawStream.cxx | 7 +- MUON/AliMUONRecoDisplay.cxx | 11 +-- MUON/AliMUONRecoEvent.cxx | 5 +- MUON/AliMUONRecoTrack.cxx | 1 + MUON/AliMUONReconstructor.cxx | 1 - MUON/AliMUONResponseV0.cxx | 1 + MUON/AliMUONSDigitizerv1.cxx | 15 ++-- MUON/AliMUONSegment.cxx | 5 +- MUON/AliMUONSegmentIndex.cxx | 3 +- MUON/AliMUONSegmentManuIndex.cxx | 3 +- MUON/AliMUONSegmentPosition.cxx | 3 +- MUON/AliMUONSegmentationDetectionElement.cxx | 37 ++++---- MUON/AliMUONSegmentationSlat.cxx | 5 +- MUON/AliMUONSegmentationSlatModule.cxx | 5 +- MUON/AliMUONSegmentationTrigger.cxx | 6 +- MUON/AliMUONSegmentationTriggerX.cxx | 4 +- MUON/AliMUONSegmentationTriggerY.cxx | 4 +- MUON/AliMUONSegmentationV0.cxx | 5 +- MUON/AliMUONSegmentationV01.cxx | 5 +- MUON/AliMUONSlatGeometryBuilder.cxx | 7 +- MUON/AliMUONSt1GeometryBuilder.cxx | 7 +- MUON/AliMUONSt1GeometryBuilderV2.cxx | 7 +- MUON/AliMUONSt1Response.cxx | 18 ++-- MUON/AliMUONSt1ResponseParameter.cxx | 7 +- MUON/AliMUONSt1ResponseRule.cxx | 1 - MUON/AliMUONSt1Segmentation.cxx | 19 ++-- MUON/AliMUONSt1SpecialMotif.cxx | 1 + MUON/AliMUONSt2GeometryBuilder.cxx | 7 +- MUON/AliMUONSubEventTracker.cxx | 2 +- MUON/AliMUONSubEventTrigger.cxx | 1 + MUON/AliMUONTrackHit.cxx | 2 +- MUON/AliMUONTrackK.cxx | 23 ++--- MUON/AliMUONTrackParam.cxx | 8 +- MUON/AliMUONTransientDigit.cxx | 5 +- MUON/AliMUONTriggerCircuit.cxx | 5 +- MUON/AliMUONTriggerDecision.cxx | 21 +++-- MUON/AliMUONTriggerGeometryBuilder.cxx | 7 +- MUON/AliMUONTriggerLut.cxx | 5 +- MUON/AliMUONVGeometryBuilder.cxx | 27 +++--- MUON/AliMUONproto.cxx | 5 +- MUON/AliMUONv1.cxx | 16 ++-- MUON/AliMUONv3.cxx | 14 +-- 76 files changed, 432 insertions(+), 473 deletions(-) diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx index 651467db6b2..74f787db3b6 100644 --- a/MUON/AliMUON.cxx +++ b/MUON/AliMUON.cxx @@ -64,6 +64,7 @@ #include "AliMUONDigitizerv2.h" #include "AliMUONSDigitizerv1.h" #include "AliMUONRawData.h" +#include "AliLog.h" // Defaults parameters for Z positions of chambers // taken from values for "stations" in AliMUON::AliMUON @@ -179,14 +180,14 @@ AliMUON::AliMUON(const AliMUON& rMUON) { // Protected copy constructor - Fatal("AliMUONMergerModule", "Not implemented."); + AliFatal("Not implemented."); } //____________________________________________________________________ AliMUON::~AliMUON() { // Destructor - if(fDebug) printf("%s: Calling AliMUON destructor !!!\n",ClassName()); + AliDebug(1,"Calling AliMUON destructor"); fIshunt = 0; if (fMerger) delete fMerger; @@ -209,7 +210,7 @@ AliMUON& AliMUON::operator = (const AliMUON& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -431,11 +432,9 @@ void AliMUON::SDigits2Digits() // write TreeD here if (!fMerger) { - if (gAlice->GetDebug()>0) { - cerr<<"AliMUON::SDigits2Digits: create default AliMUONMerger "<Init(); fMerger->Digitise(); @@ -467,7 +466,7 @@ void AliMUON::Digits2Raw() AliMUONRawData* rawData; rawData = new AliMUONRawData(fLoader); - if (!rawData->WriteRawData()) Info("MUON","pb writting raw data"); + if (!rawData->WriteRawData()) AliInfo("pb writting raw data"); delete rawData; return; } @@ -477,10 +476,9 @@ AliLoader* AliMUON::MakeLoader(const char* topfoldername) //builds standard getter (AliLoader type) //if detector wants to use castomized getter, it must overload this method - if (GetDebug()) - Info("MakeLoader", - "Creating standard getter for detector %s. Top folder is %s.", - GetName(),topfoldername); + + AliDebug(1,Form("Creating standard getter for detector %s. Top folder is %s.", + GetName(),topfoldername)); fLoader = new AliLoader(GetName(),topfoldername); fMUONData = new AliMUONData(fLoader,GetName(),GetName()); fMUONData->SetSplitLevel(fSplitLevel); diff --git a/MUON/AliMUONChamber.cxx b/MUON/AliMUONChamber.cxx index 710005f0166..68e78d376ff 100644 --- a/MUON/AliMUONChamber.cxx +++ b/MUON/AliMUONChamber.cxx @@ -22,6 +22,7 @@ // --- MUON includes --- #include "AliMUONChamber.h" #include "AliMUONChamberGeometry.h" +#include "AliLog.h" ClassImp(AliMUONChamber) @@ -71,7 +72,7 @@ AliMUONChamber::AliMUONChamber(const AliMUONChamber& rChamber) { // Protected copy constructor - Fatal("AliMUONMergerModule", "Not implemented."); + AliFatal("Not implemented."); // Dummy copy constructor } @@ -91,7 +92,7 @@ AliMUONChamber & AliMUONChamber::operator =(const AliMUONChamber& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -208,7 +209,7 @@ void AliMUONChamber::DisIntegration(Float_t eloss, Float_t /*tof*/, if (nnew >= 500) // Perform a bounds check on nnew since it is assumed // newclust only contains 500 elements. { - Error("DisIntegration", "Limit of 500 pad responses reached."); + AliError("Limit of 500 pad responses reached."); return; }; // diff --git a/MUON/AliMUONChamberGeometry.cxx b/MUON/AliMUONChamberGeometry.cxx index 93ef7d373b6..1690c009722 100644 --- a/MUON/AliMUONChamberGeometry.cxx +++ b/MUON/AliMUONChamberGeometry.cxx @@ -17,6 +17,7 @@ #include "AliMUONGeometryEnvelopeStore.h" #include "AliMUONGeometryTransformStore.h" #include "AliMUONConstants.h" +#include "AliLog.h" ClassImp(AliMUONChamberGeometry) @@ -73,8 +74,7 @@ AliMUONChamberGeometry::AliMUONChamberGeometry() AliMUONChamberGeometry::AliMUONChamberGeometry(const AliMUONChamberGeometry& rhs) : TObject(rhs) { - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -95,8 +95,7 @@ AliMUONChamberGeometry::operator = (const AliMUONChamberGeometry& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } diff --git a/MUON/AliMUONChamberTrigger.cxx b/MUON/AliMUONChamberTrigger.cxx index 289ea24508c..57f73fd7a1f 100644 --- a/MUON/AliMUONChamberTrigger.cxx +++ b/MUON/AliMUONChamberTrigger.cxx @@ -63,7 +63,7 @@ void AliMUONChamberTrigger::DisIntegration(Float_t /*eloss*/, Float_t tof, segmentation->GetPadI(xhit,yhit,0,ix,iy); segmentation->SetPad(ix,iy); - + // treatment of GEANT hits w/o corresponding strip (due to the fact that // the 2 geometries are computed in a very slightly different way) if (ix==0&&iy==0) { diff --git a/MUON/AliMUONClusterFinderAZ.cxx b/MUON/AliMUONClusterFinderAZ.cxx index e653dab7fa8..fa2c0efc7ec 100644 --- a/MUON/AliMUONClusterFinderAZ.cxx +++ b/MUON/AliMUONClusterFinderAZ.cxx @@ -41,6 +41,7 @@ #include "AliMUONClusterInput.h" #include "AliMUONPixel.h" #include "AliMC.h" +#include "AliLog.h" ClassImp(AliMUONClusterFinderAZ) @@ -79,7 +80,7 @@ AliMUONClusterFinderAZ::AliMUONClusterFinderAZ(const AliMUONClusterFinderAZ& rhs { // Protected copy constructor - Fatal("AliMUONClusterFinderAZModule", "Not implemented."); + AliFatal("Not implemented."); } //_____________________________________________________________________________ @@ -157,8 +158,7 @@ newev: muon->ResetRawClusters(); nent = (Int_t) treeR->GetEntries(); if (nent != 1) { - cout << "Error in MUONdrawClust" << endl; - cout << " nent = " << nent << " not equal to 1" << endl; + AliError(Form("nent = %d not equal to 1",nent)); //exit(0); } } // if (treeR) @@ -2499,7 +2499,7 @@ AliMUONClusterFinderAZ::operator=(const AliMUONClusterFinderAZ& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONClusterFinderVS.cxx b/MUON/AliMUONClusterFinderVS.cxx index f27e356451f..a2c713a6d38 100644 --- a/MUON/AliMUONClusterFinderVS.cxx +++ b/MUON/AliMUONClusterFinderVS.cxx @@ -25,6 +25,7 @@ #include "AliMUONResponse.h" #include "AliMUONClusterInput.h" #include "AliMUONHitMapA1.h" +#include "AliLog.h" //_____________________________________________________________________ // This function is minimized in the double-Mathieson fit @@ -70,7 +71,7 @@ AliMUONClusterFinderVS::AliMUONClusterFinderVS(const AliMUONClusterFinderVS & cl { // Protected copy constructor - Fatal("AliMUONClusterFinderAZModule", "Not implemented."); + AliFatal("Not implemented."); } //____________________________________________________________________________ void AliMUONClusterFinderVS::ResetRawClusters() @@ -146,16 +147,14 @@ void AliMUONClusterFinderVS::SplitByLocalMaxima(AliMUONRawCluster *c) fXInit[0]=c->GetX(1); fYInit[0]=c->GetY(1); } - if (fDebugLevel) - fprintf(stderr,"\n cas (1) CombiSingleMathiesonFit(c)\n"); + AliDebug(1,"cas (1) CombiSingleMathiesonFit(c)"); chi2=CombiSingleMathiesonFit(c); // Int_t ndf = fgNbins[0]+fgNbins[1]-2; // Float_t prob = TMath::Prob(Double_t(chi2),ndf); // prob1->Fill(prob); // chi2_1->Fill(chi2); oldchi2=chi2; - if (fDebugLevel) - fprintf(stderr," chi2 %f ",chi2); + AliDebug(1,Form(" chi2 %f ",chi2)); c->SetX(0, fXFit[0]); c->SetY(0, fYFit[0]); @@ -204,16 +203,13 @@ void AliMUONClusterFinderVS::SplitByLocalMaxima(AliMUONRawCluster *c) // chi2_2->Fill(chi2); // Was this any better ?? - if (fDebugLevel) - fprintf(stderr," Old and new chi2 %f %f ", oldchi2, chi2); + AliDebug(1,Form(" Old and new chi2 %f %f ", oldchi2, chi2)); if (fFitStat!=0 && chi2>0 && (2.*chi2 < oldchi2)) { - if (fDebugLevel) - fprintf(stderr," Split\n"); + AliDebug(1,"Split"); // Split cluster into two according to fit result Split(c); } else { - if (fDebugLevel) - fprintf(stderr," Don't Split\n"); + AliDebug(1,"Do not Split"); // Don't split AddRawCluster(*c); } @@ -354,39 +350,37 @@ void AliMUONClusterFinderVS::SplitByLocalMaxima(AliMUONRawCluster *c) // 1 maximum is initialised with the maximum of the combination found (X->cathode 2, Y->cathode 1) // 1 maximum is initialised with the other maximum of the first cathode if (accepted[0]){ - if (fDebugLevel) fprintf(stderr,"ico=0\n"); + AliDebug(1,"ico=0"); fXInit[0]=xm[0][1]; fYInit[0]=ym[0][0]; fXInit[1]=xm[3][0]; fYInit[1]=ym[3][0]; } else if (accepted[1]){ - if (fDebugLevel) fprintf(stderr,"ico=1\n"); + AliDebug(1,"ico=1"); fXInit[0]=xm[1][1]; fYInit[0]=ym[1][0]; fXInit[1]=xm[2][0]; fYInit[1]=ym[2][0]; } else if (accepted[2]){ - if (fDebugLevel) fprintf(stderr,"ico=2\n"); + AliDebug(1,"ico=2"); fXInit[0]=xm[2][1]; fYInit[0]=ym[2][0]; fXInit[1]=xm[1][0]; fYInit[1]=ym[1][0]; } else if (accepted[3]){ - if (fDebugLevel) fprintf(stderr,"ico=3\n"); + AliDebug(1,"ico=3"); fXInit[0]=xm[3][1]; fYInit[0]=ym[3][0]; fXInit[1]=xm[0][0]; fYInit[1]=ym[0][0]; } - if (fDebugLevel) - fprintf(stderr,"\n cas (2) CombiDoubleMathiesonFit(c)\n"); + AliDebug(1,"cas (2) CombiDoubleMathiesonFit(c)"); chi2=CombiDoubleMathiesonFit(c); // Int_t ndf = fgNbins[0]+fgNbins[1]-6; // Float_t prob = TMath::Prob(chi2,ndf); // prob2->Fill(prob); // chi2_2->Fill(chi2); - if (fDebugLevel) - fprintf(stderr," chi2 %f\n",chi2); + AliDebug(1,Form(" chi2 %f\n",chi2)); // If reasonable chi^2 add result to the list of rawclusters if (chi2<10) { @@ -396,32 +390,31 @@ void AliMUONClusterFinderVS::SplitByLocalMaxima(AliMUONRawCluster *c) // 1 maximum is initialised with the maximum of the combination found (X->cathode 2, Y->cathode 1) // 1 maximum is initialised with the other maximum of the second cathode if (accepted[0]){ - if (fDebugLevel) fprintf(stderr,"ico=0\n"); + AliDebug(1,"ico=0"); fXInit[0]=xm[0][1]; fYInit[0]=ym[0][0]; fXInit[1]=xm[3][1]; fYInit[1]=ym[3][1]; } else if (accepted[1]){ - if (fDebugLevel) fprintf(stderr,"ico=1\n"); + AliDebug(1,"ico=1"); fXInit[0]=xm[1][1]; fYInit[0]=ym[1][0]; fXInit[1]=xm[2][1]; fYInit[1]=ym[2][1]; } else if (accepted[2]){ - if (fDebugLevel) fprintf(stderr,"ico=2\n"); + AliDebug(1,"ico=2"); fXInit[0]=xm[2][1]; fYInit[0]=ym[2][0]; fXInit[1]=xm[1][1]; fYInit[1]=ym[1][1]; } else if (accepted[3]){ - if (fDebugLevel) fprintf(stderr,"ico=3\n"); + AliDebug(1,"ico=3"); fXInit[0]=xm[3][1]; fYInit[0]=ym[3][0]; fXInit[1]=xm[0][1]; fYInit[1]=ym[0][1]; } - if (fDebugLevel) - fprintf(stderr,"\n cas (2) CombiDoubleMathiesonFit(c)\n"); + AliDebug(1,"\n cas (2) CombiDoubleMathiesonFit(c)\n"); chi2=CombiDoubleMathiesonFit(c); // Int_t ndf = fgNbins[0]+fgNbins[1]-6; // Float_t prob = TMath::Prob(chi2,ndf); @@ -2108,7 +2101,7 @@ AliMUONClusterFinderVS& AliMUONClusterFinderVS if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONClusterInput.cxx b/MUON/AliMUONClusterInput.cxx index 0b0b54ff322..60bbf5c1648 100644 --- a/MUON/AliMUONClusterInput.cxx +++ b/MUON/AliMUONClusterInput.cxx @@ -25,6 +25,7 @@ #include "AliMUONResponse.h" #include "AliMUONRawCluster.h" #include "AliMUONDigit.h" +#include "AliLog.h" ClassImp(AliMUONClusterInput) @@ -65,7 +66,7 @@ AliMUONClusterInput::AliMUONClusterInput(const AliMUONClusterInput& clusterInput { // Protected copy constructor - Fatal("AliMUONClusterInput", "Not implemented."); + AliFatal("Not implemented."); } void AliMUONClusterInput::SetDigits(Int_t chamber, TClonesArray* dig1, TClonesArray* dig2) @@ -222,7 +223,7 @@ AliMUONClusterInput& AliMUONClusterInput if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONClusterReconstructor.cxx b/MUON/AliMUONClusterReconstructor.cxx index 9395478341c..9abd297251b 100644 --- a/MUON/AliMUONClusterReconstructor.cxx +++ b/MUON/AliMUONClusterReconstructor.cxx @@ -35,6 +35,7 @@ #include "AliMUONClusterInput.h" #include "AliMUONRawCluster.h" #include "AliRawReader.h" // for raw data +#include "AliLog.h" const Int_t AliMUONClusterReconstructor::fgkDefaultPrintLevel = 0; @@ -104,7 +105,7 @@ AliMUONClusterReconstructor::AliMUONClusterReconstructor (const AliMUONClusterRe { // Protected copy constructor - Fatal("AliMUONClusterReconstructor", "Not implemented."); + AliFatal("Not implemented."); } //_______________________________________________________________________ @@ -115,7 +116,7 @@ AliMUONClusterReconstructor::operator=(const AliMUONClusterReconstructor& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -158,8 +159,7 @@ void AliMUONClusterReconstructor::Digits2Clusters() //TClonesArray * muonDigits = fMUONData->Digits(ich); ndig=muonDigits->GetEntriesFast(); - if(fDebug) - printf("1 Found %d digits in %p chamber %d\n", ndig, (void*)muonDigits,ich); + AliDebug(1,Form("1 Found %d digits in %p chamber %d", ndig, (void*)muonDigits,ich)); TClonesArray &lhits1 = *dig1; Int_t n = 0; for (k = 0; k < ndig; k++) { @@ -171,8 +171,7 @@ void AliMUONClusterReconstructor::Digits2Clusters() fMUONData->GetCathode(1); muonDigits = fMUONData->Digits(ich); ndig=muonDigits->GetEntriesFast(); - if(fDebug) - printf("\n 2 Found %d digits in %p %d", ndig, (void*)muonDigits, ich); + AliDebug(1,Form("2 Found %d digits in %p %d", ndig, (void*)muonDigits, ich)); TClonesArray &lhits2 = *dig2; n=0; @@ -205,5 +204,5 @@ void AliMUONClusterReconstructor::Digits2Clusters(AliRawReader* /*rawReader*/) // Perform cluster finding form raw data - Fatal("Digits2Clusters","clusterization not implemented for raw data input"); + AliFatal("clusterization not implemented for raw data input"); } diff --git a/MUON/AliMUONConstants.cxx b/MUON/AliMUONConstants.cxx index e66a0edbb6f..b789ff22b13 100644 --- a/MUON/AliMUONConstants.cxx +++ b/MUON/AliMUONConstants.cxx @@ -17,7 +17,6 @@ #include "AliMUONConstants.h" - ClassImp(AliMUONConstants) Int_t AliMUONConstants::fgNCh = 14; diff --git a/MUON/AliMUONDDLTracker.cxx b/MUON/AliMUONDDLTracker.cxx index bbb70fd38a0..28682b889b6 100644 --- a/MUON/AliMUONDDLTracker.cxx +++ b/MUON/AliMUONDDLTracker.cxx @@ -12,7 +12,7 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ - + #include "AliMUONDDLTracker.h" #include "AliRawDataHeader.h" diff --git a/MUON/AliMUONDDLTrigger.cxx b/MUON/AliMUONDDLTrigger.cxx index f756c6795c2..6488c6f8fae 100644 --- a/MUON/AliMUONDDLTrigger.cxx +++ b/MUON/AliMUONDDLTrigger.cxx @@ -12,7 +12,7 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ - + #include "AliMUONDDLTrigger.h" ClassImp(AliMUONDDLTrigger) diff --git a/MUON/AliMUONData.cxx b/MUON/AliMUONData.cxx index dd02c281916..b3d852b59a4 100644 --- a/MUON/AliMUONData.cxx +++ b/MUON/AliMUONData.cxx @@ -32,6 +32,7 @@ #include "AliMUONRawCluster.h" #include "AliMUONTrack.h" #include "AliMUONTriggerTrack.h" +#include "AliLog.h" ClassImp(AliMUONData) @@ -112,7 +113,7 @@ AliMUONData::AliMUONData(const AliMUONData& rMUONData):TNamed(rMUONData) { // Protected copy constructor - Fatal("AliMUONData", "Not implemented."); + AliFatal("Not implemented."); } //_____________________________________________________________________________ @@ -161,7 +162,7 @@ AliMUONData& AliMUONData::operator=(const AliMUONData& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -322,7 +323,7 @@ Bool_t AliMUONData::IsRawClusterBranchesInTree() { // Checking if there are RawCluster Branches In TreeR if (TreeR()==0x0) { - Error("TreeR","No treeR in memory"); + AliError("No treeR in memory"); return kFALSE; } else { @@ -339,7 +340,7 @@ Bool_t AliMUONData::IsDigitsBranchesInTree() { // Checking if there are RawCluster Branches In TreeR if (TreeD()==0x0) { - Error("TreeD","No treeD in memory"); + AliError("No treeD in memory"); return kFALSE; } else { @@ -356,7 +357,7 @@ Bool_t AliMUONData::IsTriggerBranchesInTree() { // Checking if there are Trigger Branches In TreeR if (TreeR()==0x0) { - Error("TreeR","No treeR in memory"); + AliError("No treeR in memory"); return kFALSE; } else { @@ -373,7 +374,7 @@ Bool_t AliMUONData::IsTriggerBranchesInTreeD() { // Checking if there are Trigger Branches In TreeR if (TreeD()==0x0) { - Error("TreeD","No treeD in memory"); + AliError("No treeD in memory"); return kFALSE; } else { @@ -391,7 +392,7 @@ Bool_t AliMUONData::IsTrackBranchesInTree() { // Checking if there are Track Branches In TreeT if (TreeT()==0x0) { - Error("TreeT","No treeT in memory"); + AliError("No treeT in memory"); return kFALSE; } else { @@ -408,7 +409,7 @@ Bool_t AliMUONData::IsTriggerTrackBranchesInTree() { // Checking if there are TriggerTrack Branches In TreeT if (TreeT()==0x0) { - Error("TreeT","No treeT in memory"); + AliError("No treeT in memory"); return kFALSE; } else { @@ -561,7 +562,7 @@ void AliMUONData::MakeBranch(Option_t* option) sprintf(branchname,"%sHits",GetName()); branch = TreeH()->GetBranch(branchname); if (branch) { - Info("MakeBranch","Branch %s is already in tree.",GetName()); + AliInfo(Form("MakeBranch","Branch %s is already in tree.",GetName())); return ; } branch = TreeH()->Branch(branchname,&fHits,kBufferSize); @@ -590,7 +591,7 @@ void AliMUONData::MakeBranch(Option_t* option) branch = 0x0; branch = TreeD()->GetBranch(branchname); if (branch) { - Info("MakeBranch","Branch %s is already in tree.",GetName()); + AliInfo(Form("Branch %s is already in tree.",GetName())); return; } TClonesArray * digits = Digits(iDetectionPlane); @@ -612,7 +613,7 @@ void AliMUONData::MakeBranch(Option_t* option) } branch = TreeD()->GetBranch(branchname); if (branch) { - Info("MakeBranch","Branch GlobalTrigger is already in treeD."); + AliInfo(Form("Branch GlobalTrigger is already in treeD.")); return ; } branch = TreeD()->Branch(branchname, &fGlobalTrigger, kBufferSize); @@ -630,7 +631,7 @@ void AliMUONData::MakeBranch(Option_t* option) } branch = TreeD()->GetBranch(branchname); if (branch) { - Info("MakeBranch","Branch LocalTrigger is already in treeD."); + AliInfo(Form("Branch LocalTrigger is already in treeD.")); return; } branch = TreeD()->Branch(branchname, &fLocalTrigger, kBufferSize); @@ -660,7 +661,7 @@ void AliMUONData::MakeBranch(Option_t* option) branch = 0x0; branch = TreeS()->GetBranch(branchname); if (branch) { - Info("MakeBranch","Branch %s is already in tree.",GetName()); + AliInfo(Form("Branch %s is already in tree.",GetName())); return; } TClonesArray * sdigits = SDigits(iDetectionPlane); @@ -694,7 +695,7 @@ void AliMUONData::MakeBranch(Option_t* option) branch = 0x0; branch = TreeR()->GetBranch(branchname); if (branch) { - Info("MakeBranch","Branch %s is already in tree.",GetName()); + AliInfo(Form("Branch %s is already in tree.",GetName())); return; } branch = TreeR()->Branch(branchname, &((*fRawClusters)[i]),kBufferSize); @@ -715,7 +716,7 @@ void AliMUONData::MakeBranch(Option_t* option) } branch = TreeR()->GetBranch(branchname); if (branch) { - Info("MakeBranch","Branch GlobalTrigger is already in treeR."); + AliInfo(Form("Branch GlobalTrigger is already in treeR.")); return ; } branch = TreeR()->Branch(branchname, &fGlobalTrigger, kBufferSize); @@ -733,7 +734,7 @@ void AliMUONData::MakeBranch(Option_t* option) } branch = TreeR()->GetBranch(branchname); if (branch) { - Info("MakeBranch","Branch LocalTrigger is already in treeR."); + AliInfo(Form("Branch LocalTrigger is already in treeR.")); return; } branch = TreeR()->Branch(branchname, &fLocalTrigger, kBufferSize); @@ -746,7 +747,7 @@ void AliMUONData::MakeBranch(Option_t* option) sprintf(branchname,"%sTrack",GetName()); branch = TreeT()->GetBranch(branchname); if (branch) { - Info("MakeBranch","Branch %s is already in tree.",GetName()); + AliInfo(Form("Branch %s is already in tree.",GetName())); return ; } branch = TreeT()->Branch(branchname,&fRecTracks,kBufferSize); @@ -759,7 +760,7 @@ void AliMUONData::MakeBranch(Option_t* option) sprintf(branchname,"%sTriggerTrack",GetName()); branch = TreeT()->GetBranch(branchname); if (branch) { - Info("MakeBranch","Branch %s is already in tree.",GetName()); + AliInfo(Form("Branch %s is already in tree.",GetName())); return ; } branch = TreeT()->Branch(branchname,&fRecTriggerTracks,kBufferSize); @@ -893,7 +894,7 @@ void AliMUONData::SetTreeAddress(Option_t* option) branch->SetAddress(&fHits); } else { //can be invoked before branch creation - Warning("SetTreeAddress","(%s) Failed for Hits. Can not find branch in tree.",GetName()); + AliWarning(Form("(%s) Failed for Hits. Can not find branch in tree.",GetName())); } } @@ -925,7 +926,7 @@ void AliMUONData::SetTreeAddress(Option_t* option) if (branch) { branch->SetAddress( &digits ); } - else Warning("SetTreeAddress","(%s) Failed for Digits Detection plane %d. Can not find branch in tree.",GetName(),i); + else AliWarning(Form("(%s) Failed for Digits Detection plane %d. Can not find branch in tree.",GetName(),i)); } } } @@ -933,13 +934,13 @@ void AliMUONData::SetTreeAddress(Option_t* option) sprintf(branchname,"%sLocalTrigger",GetName()); branch = TreeD()->GetBranch(branchname); if (branch) branch->SetAddress(&fLocalTrigger); - else Warning("SetTreeAddress","(%s) Failed for LocalTrigger. Can not find branch in treeD.",GetName()); + else AliWarning(Form("(%s) Failed for LocalTrigger. Can not find branch in treeD.",GetName())); } if ( TreeD() && fGlobalTrigger && cGLT) { sprintf(branchname,"%sGlobalTrigger",GetName()); branch = TreeD()->GetBranch(branchname); if (branch) branch->SetAddress(&fGlobalTrigger); - else Warning("SetTreeAddress","(%s) Failed for GlobalTrigger. Can not find branch in treeD.",GetName()); + else AliWarning(Form("(%s) Failed for GlobalTrigger. Can not find branch in treeD.",GetName())); } // @@ -962,7 +963,7 @@ void AliMUONData::SetTreeAddress(Option_t* option) branch = TreeS()->GetBranch(branchname); TClonesArray * sdigits = SDigits(i); if (branch) branch->SetAddress( &sdigits ); - else Warning("SetTreeAddress","(%s) Failed for SDigits Detection plane %d. Can not find branch in tree.",GetName(),i); + else AliWarning(Form("(%s) Failed for SDigits Detection plane %d. Can not find branch in tree.",GetName(),i)); } } } @@ -992,7 +993,7 @@ void AliMUONData::SetTreeAddress(Option_t* option) if (fRawClusters) { branch = TreeR()->GetBranch(branchname); if (branch) branch->SetAddress( &((*fRawClusters)[i]) ); - else Warning("SetTreeAddress","(%s) Failed for RawClusters Detection plane %d. Can not find branch in tree.",GetName(),i); + else AliWarning(Form("(%s) Failed for RawClusters Detection plane %d. Can not find branch in tree.",GetName(),i)); } } } @@ -1000,13 +1001,13 @@ void AliMUONData::SetTreeAddress(Option_t* option) sprintf(branchname,"%sLocalTrigger",GetName()); branch = TreeR()->GetBranch(branchname); if (branch) branch->SetAddress(&fLocalTrigger); - else Warning("SetTreeAddress","(%s) Failed for LocalTrigger. Can not find branch in treeR.",GetName()); + else AliWarning(Form("(%s) Failed for LocalTrigger. Can not find branch in treeR.",GetName())); } if ( TreeR() && fGlobalTrigger && cTC) { sprintf(branchname,"%sGlobalTrigger",GetName()); branch = TreeR()->GetBranch(branchname); if (branch) branch->SetAddress(&fGlobalTrigger); - else Warning("SetTreeAddress","(%s) Failed for GlobalTrigger. Can not find branch in treeR.",GetName()); + else AliWarning(Form("(%s) Failed for GlobalTrigger. Can not find branch in treeR.",GetName())); } if ( TreeT() ) { @@ -1019,7 +1020,7 @@ void AliMUONData::SetTreeAddress(Option_t* option) sprintf(branchname,"%sTrack",GetName()); branch = TreeT()->GetBranch(branchname); if (branch) branch->SetAddress(&fRecTracks); - else Warning("SetTreeAddress","(%s) Failed for Tracks. Can not find branch in tree.",GetName()); + else AliWarning(Form("(%s) Failed for Tracks. Can not find branch in tree.",GetName())); } // trigger tracks if ( TreeT() ) { @@ -1032,7 +1033,7 @@ void AliMUONData::SetTreeAddress(Option_t* option) sprintf(branchname,"%sTriggerTrack",GetName()); branch = TreeT()->GetBranch(branchname); if (branch) branch->SetAddress(&fRecTriggerTracks); - else Warning("SetTreeAddress","(%s) Failed for Trigger Tracks. Can not find branch in tree.",GetName()); + else AliWarning(Form("(%s) Failed for Trigger Tracks. Can not find branch in tree.",GetName())); } diff --git a/MUON/AliMUONDataInterface.cxx b/MUON/AliMUONDataInterface.cxx index f1a10d8ba79..2bfa83bbced 100644 --- a/MUON/AliMUONDataInterface.cxx +++ b/MUON/AliMUONDataInterface.cxx @@ -13,6 +13,7 @@ #include "AliMUONHit.h" #include "AliMUONDigit.h" #include "AliMUONRawCluster.h" +#include "AliLog.h" ClassImp(AliMUONDataInterface) @@ -31,7 +32,7 @@ AliMUONDataInterface::AliMUONDataInterface(const AliMUONDataInterface& rhs) { // Protected copy constructor - Fatal("AliMUONDataInterface", "Not implemented."); + AliFatal("Not implemented."); } AliMUONDataInterface::~AliMUONDataInterface() @@ -51,7 +52,7 @@ AliMUONDataInterface::operator=(const AliMUONDataInterface& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -85,15 +86,15 @@ Bool_t AliMUONDataInterface::LoadLoaders(TString filename, TString foldername) fRunloader = AliRunLoader::Open(filename, foldername, "READ"); if (fRunloader == NULL) { - Error("LoadLoaders", "Could not find or load the run loader for the file: %s and folder: %s", - (const char*)filename, (const char*)foldername); + AliError(Form("Could not find or load the run loader for the file: %s and folder: %s", + (const char*)filename, (const char*)foldername)); return kFALSE; }; fMuonloader = fRunloader->GetLoader("MUONLoader"); if (fMuonloader == NULL) { - Error("LoadLoaders", "Could not find the MUON loader in file: %s and folder: %s", - (const char*)filename, (const char*)foldername); + AliError(Form("Could not find the MUON loader in file: %s and folder: %s", + (const char*)filename, (const char*)foldername)); fRunloader = NULL; return kFALSE; }; @@ -182,7 +183,7 @@ Bool_t AliMUONDataInterface::FetchTreeK() fRunloader->LoadKinematics("READ"); if (fRunloader->TreeK() == NULL) { - Error("FetchTreeK", "Could not load TreeK."); + AliError("Could not load TreeK."); return kFALSE; }; }; @@ -200,7 +201,7 @@ Bool_t AliMUONDataInterface::FetchTreeH() fMuonloader->LoadHits("READ"); if (fMuonloader->TreeH() == NULL) { - Error("FetchTreeH", "Could not load TreeH."); + AliError("Could not load TreeH."); return kFALSE; }; fData.SetTreeAddress("H"); @@ -225,7 +226,7 @@ Bool_t AliMUONDataInterface::FetchTreeS() fMuonloader->LoadSDigits("READ"); if (fMuonloader->TreeS() == NULL) { - Error("FetchTreeS", "Could not load TreeS."); + AliError("Could not load TreeS."); return kFALSE; }; fData.SetTreeAddress("S"); @@ -250,7 +251,7 @@ Bool_t AliMUONDataInterface::FetchTreeD() fMuonloader->LoadDigits("READ"); if (fMuonloader->TreeD() == NULL) { - Error("FetchTreeD", "Could not load TreeD."); + AliError("Could not load TreeD."); return kFALSE; }; fData.SetTreeAddress("D"); @@ -275,7 +276,7 @@ Bool_t AliMUONDataInterface::FetchTreeR() fMuonloader->LoadRecPoints("READ"); if (fMuonloader->TreeR() == NULL) { - Error("FetchTreeR", "Could not load TreeR."); + AliError("Could not load TreeR."); return kFALSE; }; @@ -595,7 +596,7 @@ Int_t AliMUONDataInterface::NumberOfEvents() if (fRunloader == NULL) { - Error("NumberOfEvents", "File not set."); + AliError("File not set."); return -1; }; return fRunloader->GetNumberOfEvents(); @@ -609,7 +610,7 @@ Int_t AliMUONDataInterface::NumberOfParticles() if (fRunloader == NULL) { - Error("NumberOfParticles", "File not set."); + AliError("File not set."); return -1; }; if ( ! FetchTreeK() ) return -1; @@ -624,12 +625,12 @@ TParticle* AliMUONDataInterface::Particle(Int_t particle) if (fRunloader == NULL) { - Error("Particle", "File not set."); + AliError("File not set."); return NULL; }; if (fEventnumber < 0) { - Error("Particle", "Event not chosen."); + AliError("Event not chosen."); return NULL; }; if ( ! FetchTreeK() ) return NULL; @@ -648,12 +649,12 @@ Int_t AliMUONDataInterface::NumberOfTracks() if (fRunloader == NULL) { - Error("NumberOfTracks", "File not set."); + AliError("File not set."); return -1; }; if (fEventnumber < 0) { - Error("NumberOfTracks", "Event not chosen."); + AliError( "Event not chosen."); return -1; }; if ( ! FetchTreeH() ) return -1; @@ -668,12 +669,12 @@ Int_t AliMUONDataInterface::NumberOfHits(Int_t track) if (fRunloader == NULL) { - Error("NumberOfHits", "File not set."); + AliError("File not set."); return -1; }; if (fEventnumber < 0) { - Error("NumberOfHits", "Event not chosen."); + AliError("Event not chosen."); return -1; }; if ( ! FetchTreeH() ) return -1; @@ -694,12 +695,12 @@ AliMUONHit* AliMUONDataInterface::Hit(Int_t track, Int_t hit) if (fRunloader == NULL) { - Error("Hit", "File not set."); + AliError("File not set."); return NULL; }; if (fEventnumber < 0) { - Error("Hit", "Event not chosen."); + AliError("Event not chosen."); return NULL; }; if ( ! FetchTreeH() ) return NULL; @@ -723,12 +724,12 @@ Int_t AliMUONDataInterface::NumberOfSDigits(Int_t chamber, Int_t cathode) if (fRunloader == NULL) { - Error("NumberOfSDigits", "File not set."); + AliError("File not set."); return -1; }; if (fEventnumber < 0) { - Error("NumberOfSDigits", "Event not chosen."); + AliError("Event not chosen."); return -1; }; @@ -753,12 +754,12 @@ AliMUONDigit* AliMUONDataInterface::SDigit(Int_t chamber, Int_t cathode, Int_t s if (fRunloader == NULL) { - Error("SDigit", "File not set."); + AliError("File not set."); return NULL; }; if (fEventnumber < 0) { - Error("SDigit", "Event not chosen."); + AliError("Event not chosen."); return NULL; }; @@ -783,12 +784,12 @@ Int_t AliMUONDataInterface::NumberOfDigits(Int_t chamber, Int_t cathode) if (fRunloader == NULL) { - Error("NumberOfDigits", "File not set."); + AliError("File not set."); return -1; }; if (fEventnumber < 0) { - Error("NumberOfDigits", "Event not chosen."); + AliError("Event not chosen."); return -1; }; @@ -813,12 +814,12 @@ AliMUONDigit* AliMUONDataInterface::Digit(Int_t chamber, Int_t cathode, Int_t di if (fRunloader == NULL) { - Error("Digit", "File not set."); + AliError("File not set."); return NULL; }; if (fEventnumber < 0) { - Error("Digit", "Event not chosen."); + AliError("Event not chosen."); return NULL; }; @@ -842,12 +843,12 @@ Int_t AliMUONDataInterface::NumberOfRawClusters(Int_t chamber) if (fRunloader == NULL) { - Error("NumberOfRawClusters", "File not set."); + AliError("File not set."); return -1; }; if (fEventnumber < 0) { - Error("NumberOfRawClusters", "Event not chosen."); + AliError("Event not chosen."); return -1; }; @@ -872,12 +873,12 @@ AliMUONRawCluster* AliMUONDataInterface::RawCluster(Int_t chamber, Int_t cluster if (fRunloader == NULL) { - Error("RawCluster", "File not set."); + AliError("File not set."); return NULL; }; if (fEventnumber < 0) { - Error("RawCluster", "Event not chosen."); + AliError("Event not chosen."); return NULL; }; @@ -900,12 +901,12 @@ Int_t AliMUONDataInterface::NumberOfLocalTriggers() if (fRunloader == NULL) { - Error("NumberOfLocalTriggers", "File not set."); + AliError("File not set."); return -1; }; if (fEventnumber < 0) { - Error("NumberOfLocalTriggers", "Event not chosen."); + AliError("Event not chosen."); return -1; }; @@ -928,12 +929,12 @@ AliMUONLocalTrigger* AliMUONDataInterface::LocalTrigger(Int_t trigger) if (fRunloader == NULL) { - Error("LocalTrigger", "File not set."); + AliError("File not set."); return NULL; }; if (fEventnumber < 0) { - Error("LocalTrigger", "Event not chosen."); + AliError( "Event not chosen."); return NULL; }; diff --git a/MUON/AliMUONDigit.cxx b/MUON/AliMUONDigit.cxx index 3fff34d4dae..4aa774b85d1 100644 --- a/MUON/AliMUONDigit.cxx +++ b/MUON/AliMUONDigit.cxx @@ -17,6 +17,7 @@ #include "AliMUONDigit.h" + ClassImp(AliMUONDigit) //_____________________________________________________________________________ AliMUONDigit::AliMUONDigit(const AliMUONDigit& digits):TObject(digits) diff --git a/MUON/AliMUONDigitizer.cxx b/MUON/AliMUONDigitizer.cxx index 735d43537ca..971cce6e05a 100644 --- a/MUON/AliMUONDigitizer.cxx +++ b/MUON/AliMUONDigitizer.cxx @@ -31,6 +31,7 @@ #include "AliMUONTransientDigit.h" #include "AliMUONHitMapA1.h" #include "AliMUONTriggerDecision.h" +#include "AliLog.h" ///////////////////////////////////////////////////////////////////////////////////// @@ -92,7 +93,7 @@ AliMUONDigitizer::AliMUONDigitizer(const AliMUONDigitizer& rhs) { // Protected copy constructor - Fatal("AliMUONDigitizer", "Not implemented."); + AliFatal("Not implemented."); } //___________________________________________ @@ -114,7 +115,7 @@ AliMUONDigitizer::operator=(const AliMUONDigitizer& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -136,12 +137,12 @@ void AliMUONDigitizer::Exec(Option_t* option) // 2) Loop over the generated transient digits and write them to the output // stream. Done in CreateDigits() - if (GetDebug() > 0) Info("Exec", "Running digitiser."); + AliDebug(1, "Running digitiser."); ParseOptions(option); if (fManager->GetNinputs() == 0) { - Warning("Exec", "No inputs set, nothing to do."); + AliWarning("No inputs set, nothing to do."); return; }; @@ -151,16 +152,15 @@ void AliMUONDigitizer::Exec(Option_t* option) InitArrays(); - if (GetDebug() > 1) Info("Exec", "Event Number is %d.", fManager->GetOutputEventNr()); + AliDebug(2, Form("Event Number is %d.", fManager->GetOutputEventNr())); // Loop over files to merge and to digitize fSignal = kTRUE; for (Int_t inputFile = 0; inputFile < fManager->GetNinputs(); inputFile++) { fMask = fManager->GetMask(inputFile); - if (GetDebug() > 1) - Info("Exec", "Digitising folder %d, with fMask = %d: %s", inputFile, fMask, - (const char*)fManager->GetInputFolderName(inputFile)); + AliDebug(2, Form("Digitising folder %d, with fMask = %d: %s", inputFile, fMask, + (const char*)fManager->GetInputFolderName(inputFile))); if (inputFile != 0) // If this is the first file then we already have the loaders loaded. @@ -206,8 +206,7 @@ void AliMUONDigitizer::UpdateTransientDigit(AliMUONTransientDigit* mTD) // Update the transient digit that is already in the fTDList by adding the new // transient digits charges and track lists to the existing one. - if (GetDebug() > 3) - Info("UpdateTransientDigit", "Updating transient digit 0x%X", (void*)mTD); + AliDebug(4,Form( "Updating transient digit 0x%X", (void*)mTD)); // Choosing the maping of the cathode plane of the chamber: Int_t iNchCpl= mTD->Chamber() + (mTD->Cathode()-1) * AliMUONConstants::NCh(); AliMUONTransientDigit *pdigit = @@ -221,13 +220,10 @@ void AliMUONDigitizer::UpdateTransientDigit(AliMUONTransientDigit* mTD) Int_t ntracks = mTD->GetNTracks(); if (ntracks > kMAXTRACKS) // Truncate the number of tracks to kMAXTRACKS if we have to. { - if (GetDebug() > 0) - { - Warning("UpdateTransientDigit", - "TransientDigit returned the number of tracks to be %d, which is bigger than kMAXTRACKS.", - ntracks); - Warning("UpdateTransientDigit", "Reseting the number of tracks to be %d.", kMAXTRACKS); - } + AliDebug(1,Form( + "TransientDigit returned the number of tracks to be %d, which is bigger than kMAXTRACKS.", + ntracks)); + AliDebug(1,Form( "Reseting the number of tracks to be %d.", kMAXTRACKS)); ntracks = kMAXTRACKS; }; @@ -243,8 +239,7 @@ void AliMUONDigitizer::AddTransientDigit(AliMUONTransientDigit* mTD) // Adds the transient digit to the fTDList and sets the appropriate entry // in the fHitMap arrays. - if (GetDebug() > 3) - Info("AddTransientDigit", "Adding transient digit 0x%X", (void*)mTD); + AliDebug(4,Form( "Adding transient digit 0x%X", (void*)mTD)); // Choosing the maping of the cathode plane of the chamber: Int_t iNchCpl= mTD->Chamber() + (mTD->Cathode()-1) * AliMUONConstants::NCh(); fTDList->AddAtAndExpand(mTD, fTDCounter); @@ -270,7 +265,7 @@ void AliMUONDigitizer::CreateDigits() // Loops over the fTDList for each cathode, gets the correct signal for the // digit and adds the new digit to the output stream. - if (GetDebug() > 1) Info("CreateDigits", "Creating digits..."); + AliDebug(2, "Creating digits..."); for (Int_t icat = 0; icat < 2; icat++) { // @@ -285,8 +280,7 @@ void AliMUONDigitizer::CreateDigits() // of digits from both cathodes. if (icat != td->Cathode() - 1) continue; - if (GetDebug() > 2) - Info("CreateDigits", "Creating digit from transient digit 0x%X", (void*)td); + AliDebug(3,Form( "Creating digit from transient digit 0x%X", (void*)td)); Int_t q = GetSignalFrom(td); if (q > 0) AddDigit(td, q); @@ -321,13 +315,10 @@ void AliMUONDigitizer::AddDigit(AliMUONTransientDigit* td, Int_t responseCharge) Int_t nptracks = td->GetNTracks(); if (nptracks > kMAXTRACKS) { - if (GetDebug() > 0) - { - Warning("AddDigit", - "TransientDigit returned the number of tracks to be %d, which is bigger than kMAXTRACKS.", - nptracks); - Warning("AddDigit", "Reseting the number of tracks to be %d.", kMAXTRACKS); - } + AliDebug(1, Form( + "TransientDigit returned the number of tracks to be %d, which is bigger than kMAXTRACKS.", + nptracks)); + AliDebug(1, Form("Reseting the number of tracks to be %d.", kMAXTRACKS)); nptracks = kMAXTRACKS; }; @@ -349,7 +340,7 @@ void AliMUONDigitizer::AddDigit(AliMUONTransientDigit* td, Int_t responseCharge) }; }; - if (GetDebug() > 3) Info("AddDigit", "Adding digit with charge %d.", responseCharge); + AliDebug(4,Form( "Adding digit with charge %d.", responseCharge)); OnWriteTransientDigit(td); AddDigit(td->Chamber(), tracks, charges, digits); @@ -381,19 +372,18 @@ Bool_t AliMUONDigitizer::FetchLoaders(const char* foldername, AliRunLoader*& run // The muon loader is then loaded from the fetched run loader. // kTRUE is returned if no error occurred otherwise kFALSE is returned. - if (GetDebug() > 2) - Info("FetchLoaders", "Fetching run loader and muon loader from folder: %s", foldername); + AliDebug(3, Form("Fetching run loader and muon loader from folder: %s", foldername)); runloader = AliRunLoader::GetRunLoader(foldername); if (runloader == NULL) { - Error("FetchLoaders", "RunLoader not found in folder: %s", foldername); + AliError(Form("RunLoader not found in folder: %s", foldername)); return kFALSE; } muonloader = (AliMUONLoader*) runloader->GetLoader("MUONLoader"); if (muonloader == NULL) { - Error("FetchLoaders", "MUONLoader not found in folder: %s", foldername); + AliError(Form("MUONLoader not found in folder: %s", foldername)); return kFALSE; } return kTRUE; @@ -409,29 +399,28 @@ Bool_t AliMUONDigitizer::FetchGlobalPointers(AliRunLoader* runloader) // AliMUONData fetched from the MUON module. // kTRUE is returned if no error occurred otherwise kFALSE is returned. - if (GetDebug() > 2) - Info("FetchGlobalPointers", "Fetching gAlice, MUON module and AliMUONData from runloader 0x%X.", + AliDebug(3, Form("Fetching gAlice, MUON module and AliMUONData from runloader 0x%X.", (void*)runloader - ); + )); if (runloader->GetAliRun() == NULL) runloader->LoadgAlice(); gAlice = runloader->GetAliRun(); if (gAlice == NULL) { - Error("FetchGlobalPointers", "Could not find the AliRun object in runloader 0x%X.", (void*)runloader); + AliError(Form("Could not find the AliRun object in runloader 0x%X.", (void*)runloader)); return kFALSE; }; fMUON = (AliMUON*) gAlice->GetDetector("MUON"); if (fMUON == NULL) { - Error("FetchGlobalPointers", "Could not find the MUON module in runloader 0x%X.", (void*)runloader); + AliError(Form("Could not find the MUON module in runloader 0x%X.", (void*)runloader)); return kFALSE; }; AliMUONLoader *muonloader = (AliMUONLoader*) runloader->GetLoader("MUONLoader"); if (muonloader == NULL) { - Error("FetchGlobalPointers", "MUONLoader not found "); + AliError( "MUONLoader not found "); return kFALSE; } @@ -439,7 +428,7 @@ Bool_t AliMUONDigitizer::FetchGlobalPointers(AliRunLoader* runloader) if (fMUONData == NULL) fMUONData = new AliMUONData(muonloader,"MUON","MUON"); if (fMUONData == NULL) { - Error("FetchGlobalPointers", "Could not find AliMUONData object in runloader 0x%X.", (void*)runloader); + AliError(Form("Could not find AliMUONData object in runloader 0x%X.", (void*)runloader)); return kFALSE; }; @@ -449,7 +438,7 @@ Bool_t AliMUONDigitizer::FetchGlobalPointers(AliRunLoader* runloader) Bool_t AliMUONDigitizer::FetchTriggerPointer(AliMUONLoader* loader) { if (fMUONData == NULL) { - Error("FetchTriggerPointer", "MUONData not found"); + AliError("MUONData not found"); return kFALSE; } @@ -474,7 +463,7 @@ void AliMUONDigitizer::ParseOptions(Option_t* options) optionString.Data() == "deb" // maintained for compatability. ) { - Info("ParseOptions", "Called with option \"debug\"."); + AliInfo("Called with option \"debug\"."); SetDebug(99); }; }; @@ -489,8 +478,8 @@ void AliMUONDigitizer::InitArrays() // // Note: the fTDList and fHitMap arrays must be NULL before calling this method. - if (GetDebug() > 1) Info("InitArrays", "Initialising internal arrays."); - if (GetDebug() > 3) Info("InitArrays", "Creating transient digits list."); + AliDebug(2, "Initialising internal arrays."); + AliDebug(4, "Creating transient digits list."); fTDList = new TObjArray; // Array of pointer of the AliMUONHitMapA1: @@ -500,11 +489,11 @@ void AliMUONDigitizer::InitArrays() // Loop over chambers for the definition AliMUONHitMap for (Int_t i = 0; i < AliMUONConstants::NCh(); i++) { - if (GetDebug() > 3) Info("InitArrays", "Creating hit map for chamber %d, cathode 1.", i+1); + AliDebug(4,Form( "Creating hit map for chamber %d, cathode 1.", i+1)); AliMUONChamber* chamber = &(fMUON->Chamber(i)); AliSegmentation* c1Segmentation = chamber->SegmentationModel(1); // Cathode plane 1 fHitMap[i] = new AliMUONHitMapA1(c1Segmentation, fTDList); - if (GetDebug() > 3) Info("InitArrays", "Creating hit map for chamber %d, cathode 2.", i+1); + AliDebug(4,Form( "Creating hit map for chamber %d, cathode 2.", i+1)); AliSegmentation* c2Segmentation = chamber->SegmentationModel(2); // Cathode plane 2 fHitMap[i+AliMUONConstants::NCh()] = new AliMUONHitMapA1(c2Segmentation, fTDList); }; @@ -515,17 +504,17 @@ void AliMUONDigitizer::CleanupArrays() { // The arrays fTDList and fHitMap are deleted and the pointers set to NULL. - if (GetDebug() > 1) Info("CleanupArrays", "Deleting internal arrays."); + AliDebug(2, "Deleting internal arrays."); for(Int_t i = 0; i < 2*AliMUONConstants::NCh(); i++) { - if (GetDebug() > 3) Info("CleanupArrays", "Deleting hit map for chamber %d, cathode %d.", - i%AliMUONConstants::NCh()+1, i/AliMUONConstants::NCh()+1); + AliDebug(4,Form( "Deleting hit map for chamber %d, cathode %d.", + i%AliMUONConstants::NCh()+1, i/AliMUONConstants::NCh()+1)); delete fHitMap[i]; }; delete [] fHitMap; fHitMap = NULL; - if (GetDebug() > 3) Info("CleanupArrays", "Deleting transient digits list."); + AliDebug(4, "Deleting transient digits list."); fTDList->Delete(); delete fTDList; fTDList = NULL; diff --git a/MUON/AliMUONDigitizerv1.cxx b/MUON/AliMUONDigitizerv1.cxx index 17c2965f647..541b8601177 100644 --- a/MUON/AliMUONDigitizerv1.cxx +++ b/MUON/AliMUONDigitizerv1.cxx @@ -39,6 +39,7 @@ #include "AliMUONHit.h" #include "AliMUONTransientDigit.h" #include "AliMUONTriggerDecision.h" +#include "AliLog.h" ClassImp(AliMUONDigitizerv1) @@ -75,15 +76,14 @@ void AliMUONDigitizerv1::GenerateTransientDigits() // Note: Charge correlation is applied to the tracking chambers. TTree* treeH = fGime->TreeH(); - if (GetDebug() > 1) - Info("GenerateTransientDigits", "Generating transient digits using treeH = 0x%X" - , (void*)treeH); + AliDebug(2, Form("Generating transient digits using treeH = 0x%X" + , (void*)treeH)); // // Loop over tracks Int_t ntracks = (Int_t) treeH->GetEntries(); for (Int_t itrack = 0; itrack < ntracks; itrack++) { - if (GetDebug() > 2) Info("GenerateTransientDigits", "Processing track %d...", itrack); + AliDebug(3, Form("Processing track %d...", itrack)); fMUONData->ResetHits(); treeH->GetEvent(itrack); // @@ -95,19 +95,14 @@ void AliMUONDigitizerv1::GenerateTransientDigits() Int_t ichamber = mHit->Chamber()-1; // chamber number if (ichamber > AliMUONConstants::NCh()-1) { - Error("GenerateTransientDigits", - "Hit 0x%X has a invalid chamber number: %d", ichamber); + AliError(Form("Hit 0x%X has a invalid chamber number: %d", ichamber)); continue; } // //Dumping Hit content: - if (GetDebug() > 2) - { - Info("GenerateTransientDigits", - "Hit %d: chamber = %d\tX = %f\tY = %f\tZ = %f\teloss = %f", + AliDebug(3,Form("Hit %d: chamber = %d\tX = %f\tY = %f\tZ = %f\teloss = %f", ihit, mHit->Chamber(), mHit->X(), mHit->Y(), mHit->Z(), mHit->Eloss() - ); - } + )); // // Inititializing Correlation AliMUONChamber& chamber = fMUON->Chamber(ichamber); @@ -133,13 +128,11 @@ void AliMUONDigitizerv1::MakeTransientDigitsFromHit(Int_t track, Int_t iHit, Ali // fired for a given hit. We then loop over the fired pads and add an AliMUONTransientDigit // for each pad. - if (GetDebug() > 3) - Info("MakeTransientDigitsFromHit", "Making transient digit for hit number %d.", iHit); + AliDebug(4,Form("Making transient digit for hit number %d.", iHit)); // // Calls the charge disintegration method of the current chamber - if (GetDebug() > 4) - Info("MakeTransientDigitsFromHit", "Calling AliMUONChamber::DisIngtegration..."); + AliDebug(5,"Calling AliMUONChamber::DisIngtegration..."); Float_t newdigit[6][500]; // Pad information Int_t nnew=0; // Number of touched Pads per hit @@ -169,10 +162,9 @@ void AliMUONDigitizerv1::MakeTransientDigitsFromHit(Int_t track, Int_t iHit, Ali }; digits[5] = iHit+fMask; // Hit number in the list - if (GetDebug() > 4) - Info("MakeTransientDigitsFromHit", + AliDebug(5,Form("MakeTransientDigitsFromHit", "DisIntegration result %d: PadX %d\tPadY %d\tPlane %d\tCharge %d\tHit %d", - iTD, digits[0], digits[1], digits[2], digits[3], digits[5]); + iTD, digits[0], digits[1], digits[2], digits[3], digits[5])); AliMUONTransientDigit* mTD = new AliMUONTransientDigit(ichamber, digits); mTD->AddToTrackList(track + fMask, charge); @@ -201,7 +193,7 @@ void AliMUONDigitizerv1::FillTriggerOutput() { // Derived to fill TreeD and resets the trigger array in fMUONData. - if (GetDebug() > 2) Info("FillTriggerOutput", "Filling trees with trigger."); + AliDebug(3,"Filling trees with trigger."); fMUONData->Fill("GLT"); fMUONData->ResetTrigger(); }; @@ -222,8 +214,7 @@ Int_t AliMUONDigitizerv1::GetSignalFrom(AliMUONTransientDigit* td) // Derived to apply the chamber response model to the digit. // Using AliMUONChamber::ResponseModel() for this. - if (GetDebug() > 3) - Info("GetSignalFrom", "Applying response of chamber to TransientDigit signal."); + AliDebug(4, "Applying response of chamber to TransientDigit signal."); // // Digit Response (noise, threshold, saturation, ...) Int_t q = td->Signal(); @@ -239,8 +230,7 @@ Bool_t AliMUONDigitizerv1::InitOutputData(AliMUONLoader* muonloader) // Derived to initialize the output digits tree TreeD, create it if necessary // and sets the fMUONData tree address to treeD. - if (GetDebug() > 2) - Info("InitOutputData", "Creating digits branch and setting the tree address."); + AliDebug(3, "Creating digits branch and setting the tree address."); fMUONData->SetLoader(muonloader); @@ -250,7 +240,7 @@ Bool_t AliMUONDigitizerv1::InitOutputData(AliMUONLoader* muonloader) muonloader->MakeDigitsContainer(); if (muonloader->TreeD() == NULL) { - Error("InitOutputData", "Could not create TreeD."); + AliError("Could not create TreeD."); return kFALSE; }; }; @@ -266,7 +256,7 @@ void AliMUONDigitizerv1::FillOutputData() { // Derived to fill TreeD and resets the digit array in fMUONData. - if (GetDebug() > 2) Info("FillOutputData", "Filling trees with digits."); + AliDebug(3, "Filling trees with digits."); fMUONData->Fill("D"); fMUONData->ResetDigits(); }; @@ -276,7 +266,7 @@ void AliMUONDigitizerv1::CleanupOutputData(AliMUONLoader* muonloader) { // Derived to write the digits tree and then unload the digits tree once written. - if (GetDebug() > 2) Info("CleanupOutputData", "Writing digits and releasing pointers."); + AliDebug(3, "Writing digits and releasing pointers."); muonloader->WriteDigits("OVERWRITE"); muonloader->UnloadDigits(); }; @@ -288,8 +278,7 @@ Bool_t AliMUONDigitizerv1::InitInputData(AliMUONLoader* muonloader) // Derived to initialise the input to read from TreeH the hits tree. // If the hits are not loaded then we load the hits using the muon loader. - if (GetDebug() > 2) - Info("InitInputData", "Loading hits in READ mode and setting the tree address."); + AliDebug(3, "Loading hits in READ mode and setting the tree address."); fMUONData->SetLoader(muonloader); @@ -298,7 +287,7 @@ Bool_t AliMUONDigitizerv1::InitInputData(AliMUONLoader* muonloader) muonloader->LoadHits("READ"); if (muonloader->TreeH() == NULL) { - Error("InitInputData", "Can not load the hits tree."); + AliError("Can not load the hits tree."); return kFALSE; }; }; @@ -312,7 +301,7 @@ void AliMUONDigitizerv1::CleanupInputData(AliMUONLoader* muonloader) { // Derived to release the loaded hits and unload them. - if (GetDebug() > 2) Info("CleanupInputData", "Releasing loaded hits."); + AliDebug(3, "Releasing loaded hits."); fMUONData->ResetHits(); muonloader->UnloadHits(); }; diff --git a/MUON/AliMUONDigitizerv2.cxx b/MUON/AliMUONDigitizerv2.cxx index 6780262d84a..4480b2d6455 100644 --- a/MUON/AliMUONDigitizerv2.cxx +++ b/MUON/AliMUONDigitizerv2.cxx @@ -34,6 +34,7 @@ #include "AliMUONDigit.h" #include "AliMUONDigitizerv2.h" #include "AliMUONTransientDigit.h" +#include "AliLog.h" ClassImp(AliMUONDigitizerv2) @@ -61,9 +62,7 @@ void AliMUONDigitizerv2::GenerateTransientDigits() // Loop over all chambers and s-digits in the input stream and create // AliMUONTransientDigit objects from them. These are then added to fTDList. - if (GetDebug() > 1) - Info("GenerateTransientDigits", "Generating transient digits using treeH = 0x%X"); - + AliDebug(2,"Generating transient digits using treeH = 0x%X"); // // Loop over SDigits Int_t ndig, k; @@ -98,10 +97,7 @@ void AliMUONDigitizerv2::MakeTransientDigitFromSDigit(Int_t iChamber, AliMUONDig // Makes a transient digit from the specified s-digit from the specified chamber. // Once the digit is created it is added to the fTDList. - if (GetDebug() > 3) - Info("MakeTransientDigitFromSDigit", - "Making transient digit from s-digit for chamber %d.", iChamber); - + AliDebug(4,Form("Making transient digit from s-digit for chamber %d.", iChamber)); Int_t digits[6]; // // Creating a new TransientDigits from SDigit @@ -116,10 +112,8 @@ void AliMUONDigitizerv2::MakeTransientDigitFromSDigit(Int_t iChamber, AliMUONDig digits[5] = sDigit->Hit(); // Hit number in the list - if (GetDebug() > 4) - Info("MakeTransientDigitFromSDigit", - "Made digit from sDigit 0x%X: PadX %d\tPadY %d\tPlane %d\tCharge %d\tHit %d", - (void*)sDigit, digits[0], digits[1], digits[2], digits[3], digits[5]); + AliDebug(5,Form("Made digit from sDigit 0x%X: PadX %d\tPadY %d\tPlane %d\tCharge %d\tHit %d", + (void*)sDigit, digits[0], digits[1], digits[2], digits[3], digits[5])); AliMUONTransientDigit* mTD = new AliMUONTransientDigit(iChamber, digits); // Copy list of tracks and trackcharge @@ -148,9 +142,7 @@ Bool_t AliMUONDigitizerv2::InitInputData(AliMUONLoader* muonloader) // If the s-digits are not loaded then the muon loader is used to load the // s-digits into memory. - if (GetDebug() > 2) - Info("InitInputData", "Loading s-digits in READ mode and setting the tree address."); - + AliDebug(3,"Loading s-digits in READ mode and setting the tree address."); fMUONData->SetLoader(muonloader); if (muonloader->TreeS() == NULL) @@ -158,7 +150,7 @@ Bool_t AliMUONDigitizerv2::InitInputData(AliMUONLoader* muonloader) muonloader->LoadSDigits("READ"); if (muonloader->TreeS() == NULL) { - Error("InitInputData", "Can not load the s-digits tree."); + AliError("Can not load the s-digits tree."); return kFALSE; }; }; @@ -172,7 +164,7 @@ void AliMUONDigitizerv2::CleanupInputData(AliMUONLoader* muonloader) { // Overridden to release and unload s-digits from memory. - if (GetDebug() > 2) Info("CleanupInputData", "Releasing loaded s-digits."); + AliDebug(3,"Releasing loaded s-digits."); fMUONData->ResetSDigits(); muonloader->UnloadSDigits(); }; diff --git a/MUON/AliMUONDisplay.cxx b/MUON/AliMUONDisplay.cxx index c61e51d66c5..00d26bd6819 100644 --- a/MUON/AliMUONDisplay.cxx +++ b/MUON/AliMUONDisplay.cxx @@ -59,6 +59,7 @@ #include "AliMUONChamber.h" #include "AliMUONConstants.h" #include "AliMC.h" +#include "AliLog.h" // to manage the same zoom on both cathodes @@ -233,7 +234,7 @@ AliMUONDisplay::AliMUONDisplay(const AliMUONDisplay & display) { // Protected copy constructor - Fatal("AliMUONDisplay", "Not implemented."); + AliFatal("Not implemented."); } @@ -1486,7 +1487,7 @@ AliMUONDisplay & AliMUONDisplay::operator = (const AliMUONDisplay & rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONEventReconstructor.cxx b/MUON/AliMUONEventReconstructor.cxx index 11b7613cbbf..2c21a553838 100644 --- a/MUON/AliMUONEventReconstructor.cxx +++ b/MUON/AliMUONEventReconstructor.cxx @@ -57,6 +57,7 @@ #include "AliLoader.h" #include "AliMUONTrackK.h" //AZ #include "AliMC.h" +#include "AliLog.h" //************* Defaults parameters for reconstruction const Double_t AliMUONEventReconstructor::fgkDefaultMinBendingMomentum = 3.0; @@ -159,7 +160,7 @@ AliMUONEventReconstructor::AliMUONEventReconstructor (const AliMUONEventReconstr { // Protected copy constructor - Fatal("AliMUONEventReconstructor", "Not implemented."); + AliFatal("Not implemented."); } AliMUONEventReconstructor & @@ -169,7 +170,7 @@ AliMUONEventReconstructor::operator=(const AliMUONEventReconstructor& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -344,9 +345,8 @@ void AliMUONEventReconstructor::NextBkgGeantEvent(void) sprintf(treeName, "TreeK%d", fBkgGeantEventNumber); fBkgGeantTK = (TTree*)gDirectory->Get(treeName); if (!fBkgGeantTK) { - cout << "ERROR: cannot find Kine Tree for background event: " << - fBkgGeantEventNumber << endl; - exit(0); + AliError(Form("cannot find Kine Tree for background event: %d",fBkgGeantEventNumber)); + exit(0); } } if (fBkgGeantTK) @@ -356,8 +356,7 @@ void AliMUONEventReconstructor::NextBkgGeantEvent(void) sprintf(treeName, "TreeH%d", fBkgGeantEventNumber); fBkgGeantTH = (TTree*)gDirectory->Get(treeName); if (!fBkgGeantTH) { - cout << "ERROR: cannot find Hits Tree for background event: " << - fBkgGeantEventNumber << endl; + AliError(Form("cannot find Hits Tree for background event: %d",fBkgGeantEventNumber)); exit(0); } if (fBkgGeantTH && fBkgGeantHits) { @@ -490,13 +489,13 @@ void AliMUONEventReconstructor::MakeEventToBeReconstructed(void) Int_t retval = fLoader->LoadHits(); if ( retval) { - Error("MakeEventToBeReconstructed","Error occured while loading hits."); + AliError("Error occured while loading hits."); return; } treeH = fLoader->TreeH(); if (treeH == 0x0) { - Error("MakeEventToBeReconstructed","Can not get TreeH"); + AliError("Can not get TreeH"); return; } } @@ -780,9 +779,7 @@ void AliMUONEventReconstructor::AddHitsForRecFromRawClusters(TTree* TR) nTRentries = Int_t(TR->GetEntries()); if (nTRentries != 1) { - cout << "Error in AliMUONEventReconstructor::AddHitsForRecFromRawClusters" - << endl; - cout << "nTRentries = " << nTRentries << " not equal to 1" << endl; + AliError(Form("nTRentries = %d not equal to 1 ",nTRentries)); exit(0); } fLoader->TreeR()->GetEvent(0); // only one entry @@ -1040,9 +1037,7 @@ Bool_t AliMUONEventReconstructor::MakeTriggerTracks(void) treeR->GetEvent(0); // only one entry if (!(fMUONData->IsTriggerBranchesInTree())) { - cout << "Warning in AliMUONEventReconstructor::MakeTriggerTracks" - << endl; - cout << "Trigger information is not avalaible, nTRentries = " << nTRentries << " not equal to 1" << endl; + AliWarning(Form("Trigger information is not avalaible, nTRentries = %d not equal to 1",nTRentries)); return kFALSE; } diff --git a/MUON/AliMUONFactory.cxx b/MUON/AliMUONFactory.cxx index 1f1c002d12b..2de8215d0d7 100644 --- a/MUON/AliMUONFactory.cxx +++ b/MUON/AliMUONFactory.cxx @@ -30,6 +30,7 @@ #include "AliMUONSegmentationSlatN.h" #include "AliMUONSegmentationTriggerX.h" #include "AliMUONSegmentationTriggerY.h" +#include "AliLog.h" ClassImp(AliMUONFactory) @@ -48,7 +49,7 @@ AliMUONFactory::AliMUONFactory(const AliMUONFactory& rhs) { // Protected copy constructor - Fatal("AliMUONFactory", "Not implemented."); + AliFatal("Not implemented."); } //__________________________________________________________________________ @@ -65,7 +66,7 @@ AliMUONFactory& AliMUONFactory::operator=(const AliMUONFactory& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -578,14 +579,8 @@ void AliMUONFactory::Build(AliMUON* where, const char* what) BuildStation5(); BuildStation6(); } - else { - if(fMUON->GetDebug()) { - printf("\nAliMUONFactory: --------AliMUONFactory------------------------------"); - printf("\nAliMUONFactory: Non default version of MUON selected "); - printf("\nAliMUONFactory: You have to construct yourself the MUON elements !!"); - printf("\nAliMUONFactory: ----------------------------------------------------"); - } - } + else + AliDebug(0,"Non default version of MUON selected. You have to construct yourself the MUON elements !!"); } //__________________________________________________________________________ @@ -615,6 +610,6 @@ void AliMUONFactory::BuildStation(AliMUON* where, Int_t stationNumber) case 5: BuildStation5(); break; case 6: BuildStation6(); break; - default: Fatal("Build", "Wrong station number"); + default: AliFatal("Wrong station number"); } } diff --git a/MUON/AliMUONGeometryBuilder.cxx b/MUON/AliMUONGeometryBuilder.cxx index 9739f5a4999..487dc76e031 100644 --- a/MUON/AliMUONGeometryBuilder.cxx +++ b/MUON/AliMUONGeometryBuilder.cxx @@ -37,6 +37,7 @@ #include "AliMUONGeometryConstituent.h" #include "AliMagF.h" #include "AliRun.h" +#include "AliLog.h" ClassImp(AliMUONGeometryBuilder) @@ -77,7 +78,7 @@ AliMUONGeometryBuilder::AliMUONGeometryBuilder(const AliMUONGeometryBuilder& rig { // copy constructor (not implemented) - Fatal("AliMUONGeometryBuilder", "Copy constructor not provided."); + AliFatal("Copy constructor not provided."); } //______________________________________________________________________________ @@ -102,7 +103,7 @@ AliMUONGeometryBuilder::operator=(const AliMUONGeometryBuilder& right) // check assignement to self if (this == &right) return *this; - Fatal("operator =", "Assignement operator not provided."); + AliFatal("Assignement operator not provided."); return *this; } @@ -232,7 +233,7 @@ void AliMUONGeometryBuilder::CreateGeometry() // virtual envelope + nof constituents = 0 // => not allowed; // empty virtual envelope has no sense - Fatal("CreateGeometry", "Virtual envelope must have constituents."); + AliFatal("Virtual envelope must have constituents."); return; } @@ -240,7 +241,7 @@ void AliMUONGeometryBuilder::CreateGeometry() // non virtual envelope + nof constituents > 0 // => not allowed; // use VMC to place constituents - Fatal("CreateGeometry", "Non virtual envelope cannot have constituents."); + AliFatal("Non virtual envelope cannot have constituents."); return; } diff --git a/MUON/AliMUONGeometryConstituent.cxx b/MUON/AliMUONGeometryConstituent.cxx index b46a77c40d9..241a4abf846 100644 --- a/MUON/AliMUONGeometryConstituent.cxx +++ b/MUON/AliMUONGeometryConstituent.cxx @@ -24,6 +24,7 @@ #include #include "AliMUONGeometryConstituent.h" +#include "AliLog.h" ClassImp(AliMUONGeometryConstituent) @@ -130,8 +131,7 @@ AliMUONGeometryConstituent::AliMUONGeometryConstituent( const AliMUONGeometryConstituent& rhs) : TNamed(rhs) { - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -149,8 +149,7 @@ AliMUONGeometryConstituent::operator = (const AliMUONGeometryConstituent& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } diff --git a/MUON/AliMUONGeometryEnvelope.cxx b/MUON/AliMUONGeometryEnvelope.cxx index 42ca882d7ca..10201526846 100644 --- a/MUON/AliMUONGeometryEnvelope.cxx +++ b/MUON/AliMUONGeometryEnvelope.cxx @@ -27,6 +27,7 @@ #include "AliMUONGeometryEnvelope.h" #include "AliMUONGeometryConstituent.h" +#include "AliLog.h" ClassImp(AliMUONGeometryEnvelope) @@ -98,8 +99,7 @@ AliMUONGeometryEnvelope::AliMUONGeometryEnvelope( const AliMUONGeometryEnvelope& rhs) : TNamed(rhs) { - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -123,8 +123,7 @@ AliMUONGeometryEnvelope::operator = (const AliMUONGeometryEnvelope& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } diff --git a/MUON/AliMUONGeometryEnvelopeStore.cxx b/MUON/AliMUONGeometryEnvelopeStore.cxx index c78e2a97b97..628bdda94f4 100644 --- a/MUON/AliMUONGeometryEnvelopeStore.cxx +++ b/MUON/AliMUONGeometryEnvelopeStore.cxx @@ -17,6 +17,7 @@ #include "AliMUONGeometryTransformStore.h" #include "AliMUONGeometryEnvelope.h" #include "AliMUONConstants.h" +#include "AliLog.h" ClassImp(AliMUONGeometryEnvelopeStore) @@ -51,8 +52,7 @@ AliMUONGeometryEnvelopeStore::AliMUONGeometryEnvelopeStore() AliMUONGeometryEnvelopeStore::AliMUONGeometryEnvelopeStore(const AliMUONGeometryEnvelopeStore& rhs) : TObject(rhs) { - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -75,8 +75,7 @@ AliMUONGeometryEnvelopeStore::operator = (const AliMUONGeometryEnvelopeStore& rh // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } @@ -116,7 +115,7 @@ Bool_t AliMUONGeometryEnvelopeStore::AlignEnvelope( const TGeoCombiTrans* kTransform = fDETransforms->Get(detElemId); if (!kTransform) { - Warning("AlignEnvelope", "Transformation not found."); + AliWarning("Transformation not found."); return false; }; @@ -138,12 +137,8 @@ void AliMUONGeometryEnvelopeStore::AddEnvelope(const TString& name, // to the list of envelopes. // --- - if (fDebug) { - cout << "... Adding "; - if (!isVirtual) cout << " non-"; - cout << "virtual envelope " << name - << " id " << id << endl; - } + if (!isVirtual) AliDebug(1,Form("Adding non-virtual envelope %s id %d",name.Data(),id)); +// else AliDebug(1,Form("Adding virtual envelope %s id %d",name.Data(),id)); AliMUONGeometryEnvelope* envelope = new AliMUONGeometryEnvelope(name, id, isVirtual, only); diff --git a/MUON/AliMUONGeometrySVMap.cxx b/MUON/AliMUONGeometrySVMap.cxx index 27c15a0f791..eab7e7fb54e 100644 --- a/MUON/AliMUONGeometrySVMap.cxx +++ b/MUON/AliMUONGeometrySVMap.cxx @@ -20,6 +20,7 @@ #include #include "AliMUONGeometrySVMap.h" +#include "AliLog.h" ClassImp(AliMUONGeometrySVMap) @@ -43,8 +44,7 @@ AliMUONStringIntMap::AliMUONStringIntMap() AliMUONStringIntMap::AliMUONStringIntMap(const AliMUONStringIntMap& rhs) : TObject(rhs) { - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -54,8 +54,7 @@ AliMUONStringIntMap::operator = (const AliMUONStringIntMap& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } @@ -77,7 +76,7 @@ Bool_t AliMUONStringIntMap::Add(const TString& first, Int_t second) Int_t second2 = Get(first); if ( second2 > 0 ) { - Error("Add", "%s is already present in the map", first.Data()); + AliError(Form("%s is already present in the map", first.Data())); return false; } @@ -189,8 +188,7 @@ AliMUONGeometrySVMap::AliMUONGeometrySVMap() AliMUONGeometrySVMap::AliMUONGeometrySVMap(const AliMUONGeometrySVMap& rhs) : TObject(rhs) { - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -206,8 +204,7 @@ AliMUONGeometrySVMap::operator = (const AliMUONGeometrySVMap& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } diff --git a/MUON/AliMUONGeometryTransformStore.cxx b/MUON/AliMUONGeometryTransformStore.cxx index d42503861e3..0e06c5c5151 100644 --- a/MUON/AliMUONGeometryTransformStore.cxx +++ b/MUON/AliMUONGeometryTransformStore.cxx @@ -13,6 +13,7 @@ #include #include "AliMUONGeometryTransformStore.h" +#include "AliLog.h" ClassImp(AliMUONGeometryTransformStore) @@ -50,8 +51,7 @@ AliMUONGeometryTransformStore::AliMUONGeometryTransformStore( const AliMUONGeometryTransformStore& rhs) : TObject(rhs) { - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -67,8 +67,7 @@ AliMUONGeometryTransformStore::operator = (const AliMUONGeometryTransformStore& // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } @@ -135,8 +134,8 @@ void AliMUONGeometryTransformStore::Add(Int_t detElemId, fDETransforms.AddAt(newTransform, GetDetElementIndex(detElemId)); } else - Warning("Add", "The aligned volume %s is already present", - alignedVolume.Data()); + AliWarning(Form("The aligned volume %s is already present", + alignedVolume.Data())); } //______________________________________________________________________________ @@ -197,7 +196,7 @@ AliMUONGeometryTransformStore::Get(Int_t detElemId) const if ( index >= 0 && index < fNofDetElems ) return (const TGeoCombiTrans*)fDETransforms.At(index); else { - Warning("Get","Index %d out of limits", index); + AliWarning(Form("Index %d out of limits", index)); return 0; } } diff --git a/MUON/AliMUONGlobalTrigger.cxx b/MUON/AliMUONGlobalTrigger.cxx index f11b4cb9cd4..1763ed593bb 100644 --- a/MUON/AliMUONGlobalTrigger.cxx +++ b/MUON/AliMUONGlobalTrigger.cxx @@ -11,7 +11,8 @@ * appear in the supporting documentation. The authors make no claims * * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * - **************************************************************************/ + **************************************************************************/ + /* $Id$ */ diff --git a/MUON/AliMUONHitForRec.cxx b/MUON/AliMUONHitForRec.cxx index 1537a7d2463..67f23a1a8f6 100644 --- a/MUON/AliMUONHitForRec.cxx +++ b/MUON/AliMUONHitForRec.cxx @@ -23,6 +23,7 @@ #include "AliMUONHitForRec.h" #include "AliMUONRawCluster.h" #include "AliMUONHit.h" +#include "AliLog.h" ClassImp(AliMUONHitForRec) // Class implementation in ROOT context @@ -102,7 +103,7 @@ AliMUONHitForRec::AliMUONHitForRec (const AliMUONHitForRec& rhs) { // Protected copy constructor - Fatal("AliMUONHitForRec", "Not implemented."); + AliFatal( "Not implemented."); } //__________________________________________________________________________ @@ -112,7 +113,7 @@ AliMUONHitForRec & AliMUONHitForRec::operator=(const AliMUONHitForRec& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal( "Not implemented."); return *this; } diff --git a/MUON/AliMUONHitMapA1.cxx b/MUON/AliMUONHitMapA1.cxx index 21b98259a25..8786063c2d1 100644 --- a/MUON/AliMUONHitMapA1.cxx +++ b/MUON/AliMUONHitMapA1.cxx @@ -21,6 +21,7 @@ #include "AliMUONHitMapA1.h" #include "AliSegmentation.h" #include "AliMUONDigit.h" +#include "AliLog.h" ClassImp(AliMUONHitMapA1) @@ -54,7 +55,7 @@ AliMUONHitMapA1::AliMUONHitMapA1(const AliMUONHitMapA1 & hitMap) { // Protected copy constructor - Fatal("AliMUONHitMapA1", "Not implemented."); + AliFatal("Not implemented."); } @@ -164,7 +165,7 @@ AliMUONHitMapA1 & AliMUONHitMapA1::operator = (const AliMUONHitMapA1 & rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal( "Not implemented."); return *this; } diff --git a/MUON/AliMUONLoader.cxx b/MUON/AliMUONLoader.cxx index bd2c00ccd76..853c74af71d 100644 --- a/MUON/AliMUONLoader.cxx +++ b/MUON/AliMUONLoader.cxx @@ -21,6 +21,7 @@ //AliRoot includes #include "AliMUONLoader.h" #include "AliMUONConstants.h" +#include "AliLog.h" ClassImp(AliMUONLoader) //___________________________________________________________________ @@ -49,7 +50,7 @@ AliMUONLoader::AliMUONLoader(const AliMUONLoader& rhs) { // Protected copy constructor - Fatal("AliMUONLoader", "Not implemented."); + AliFatal("Not implemented."); } //_______________________________________________________________________________ @@ -65,7 +66,7 @@ AliMUONLoader::operator=(const AliMUONLoader& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONMerger.cxx b/MUON/AliMUONMerger.cxx index 1993a03148d..1584e4969c8 100644 --- a/MUON/AliMUONMerger.cxx +++ b/MUON/AliMUONMerger.cxx @@ -20,6 +20,7 @@ #include //#include //#include +#include "AliLog.h" #include "AliMUONMerger.h" #include "AliMUON.h" @@ -58,7 +59,7 @@ AliMUONMerger::AliMUONMerger(const AliMUONMerger&) { // Protected copy constructor - Fatal("AliMUONMergerModule", "Not implemented."); + Fatal("copy constructor","Not implemented."); } //------------------------------------------------------------------------ diff --git a/MUON/AliMUONPadHit.cxx b/MUON/AliMUONPadHit.cxx index 8d9c1343fbe..49902c1d610 100644 --- a/MUON/AliMUONPadHit.cxx +++ b/MUON/AliMUONPadHit.cxx @@ -12,7 +12,6 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ - /* $Id$ */ #include "AliMUONPadHit.h" diff --git a/MUON/AliMUONPoints.cxx b/MUON/AliMUONPoints.cxx index e13c891a74a..6ff6ab14f42 100644 --- a/MUON/AliMUONPoints.cxx +++ b/MUON/AliMUONPoints.cxx @@ -41,6 +41,7 @@ #include "AliMUON.h" #include "AliMUONHit.h" #include "AliMUONDigit.h" +#include "AliLog.h" ClassImp(AliMUONPoints) @@ -78,7 +79,7 @@ AliMUONPoints::AliMUONPoints(const AliMUONPoints& points) { // Protected copy constructor - Fatal("AliMUONPoints", "Not implemented."); + AliFatal("Not implemented."); } //_____________________________________________________________________________ @@ -247,7 +248,7 @@ AliMUONPoints& AliMUONPoints::operator= (const AliMUONPoints& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONRawData.cxx b/MUON/AliMUONRawData.cxx index a53023f8c5a..30d62a68bee 100644 --- a/MUON/AliMUONRawData.cxx +++ b/MUON/AliMUONRawData.cxx @@ -42,6 +42,7 @@ #include "AliMUONLocalTrigger.h" #include "AliMUONGlobalTrigger.h" +#include "AliLog.h" const Int_t AliMUONRawData::fgkDefaultPrintLevel = 0; @@ -96,7 +97,7 @@ AliMUONRawData::AliMUONRawData (const AliMUONRawData& rhs) { // Protected copy constructor - Fatal("AliMUONRawData", "Not implemented."); + AliFatal("Not implemented."); } //_______________________________________________________________________ @@ -107,7 +108,7 @@ AliMUONRawData::operator=(const AliMUONRawData& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -444,7 +445,7 @@ Int_t AliMUONRawData::WriteTriggerDDL() } if (!nEntries) - Error("AliMUONRawData::WriteTriggerDDL","No Trigger information available"); + AliError("No Trigger information available"); buffer = new Int_t [680]; // [16(local)*5 words + 4 words]*8(reg) + 8 words = 680 diff --git a/MUON/AliMUONRawStream.cxx b/MUON/AliMUONRawStream.cxx index 3bc7e8150ed..53e5af28cc3 100644 --- a/MUON/AliMUONRawStream.cxx +++ b/MUON/AliMUONRawStream.cxx @@ -29,6 +29,7 @@ #include "AliMUONRawStream.h" #include "AliRawReader.h" +#include "AliLog.h" ClassImp(AliMUONRawStream) @@ -49,13 +50,13 @@ AliMUONRawStream::AliMUONRawStream(AliRawReader* rawReader) AliMUONRawStream::AliMUONRawStream(const AliMUONRawStream& stream) : TObject(stream) { - Fatal("AliMUONRawStream", "copy constructor not implemented"); + AliFatal("copy constructor not implemented"); } AliMUONRawStream& AliMUONRawStream::operator = (const AliMUONRawStream& /* stream */) { - Fatal("operator =", "assignment operator not implemented"); + AliFatal("assignment operator not implemented"); return *this; } @@ -72,7 +73,7 @@ Bool_t AliMUONRawStream::Next() // read the next raw digit // returns kFALSE if there is no digit left - Fatal("Next","method not implemented for raw data input"); + AliFatal("method not implemented for raw data input"); return kFALSE; diff --git a/MUON/AliMUONRecoDisplay.cxx b/MUON/AliMUONRecoDisplay.cxx index 41a4ff94436..f08fd9159eb 100644 --- a/MUON/AliMUONRecoDisplay.cxx +++ b/MUON/AliMUONRecoDisplay.cxx @@ -72,6 +72,7 @@ #include "AliMUONRecoEvent.h" #include "AliMUONRecoTrack.h" #include "AliMUONHit.h" +#include "AliLog.h" ClassImp(AliMUONRecoDisplay) @@ -125,7 +126,7 @@ AliMUONRecoDisplay::AliMUONRecoDisplay(const AliMUONRecoDisplay& rhs) { // Protected copy constructor - Fatal("AliMUONRecoDisplay", "Not implemented."); + AliFatal("Not implemented."); } //------------------------------------------------------------------- @@ -151,7 +152,7 @@ AliMUONRecoDisplay::operator=(const AliMUONRecoDisplay& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -450,20 +451,20 @@ void AliMUONRecoDisplay::ShowNextEvent(Int_t delta) TFolder* topfold = (TFolder*)config->GetTopFolder(); if (topfold == 0x0) { - Error("Exec","Can not get Alice top folder"); + AliError("Can not get Alice top folder"); return; } TString fmdfoldname(config->GetDataFolderName()+"/"+"MUON"); TFolder* fmdfold = (TFolder*)topfold->FindObject(fmdfoldname); if (fmdfold == 0x0) { - Error("Exec","Can not get MUON folder"); + AliError("Can not get MUON folder"); return; } TTree* treeH = dynamic_cast(fmdfold->FindObject("TreeH")); if (treeH == 0x0) { - Error("Exec","Can not get TreeH"); + AliError("Can not get TreeH"); return; } /******************************************************************/ diff --git a/MUON/AliMUONRecoEvent.cxx b/MUON/AliMUONRecoEvent.cxx index eebef1ac97e..430178a1dc5 100644 --- a/MUON/AliMUONRecoEvent.cxx +++ b/MUON/AliMUONRecoEvent.cxx @@ -54,6 +54,7 @@ #include "AliMUONTrackHit.h" #include "AliRun.h" #include "AliHeader.h" +#include "AliLog.h" ClassImp(AliMUONRecoEvent) @@ -73,7 +74,7 @@ AliMUONRecoEvent::AliMUONRecoEvent(const AliMUONRecoEvent& rhs) { // Protected copy constructor - Fatal("AliMUONRecoEventModule", "Not implemented."); + AliFatal("Not implemented."); } //------------------------------------------------------------------- @@ -93,7 +94,7 @@ AliMUONRecoEvent::operator=(const AliMUONRecoEvent& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONRecoTrack.cxx b/MUON/AliMUONRecoTrack.cxx index 3b34ab06985..572ed7ffd55 100644 --- a/MUON/AliMUONRecoTrack.cxx +++ b/MUON/AliMUONRecoTrack.cxx @@ -82,6 +82,7 @@ void AliMUONRecoTrack::SetHitPosition(Int_t chamber, Double_t x, Double_t y, Dou fPosY[chamber] = y; fPosZ[chamber] = z; } + //------------------------------------------------------------------- void AliMUONRecoTrack::TrackInfo() { diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx index cfe54e040d3..a5ca740c48f 100644 --- a/MUON/AliMUONReconstructor.cxx +++ b/MUON/AliMUONReconstructor.cxx @@ -12,7 +12,6 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ - /* $Id$ */ /////////////////////////////////////////////////////////////////////////////// diff --git a/MUON/AliMUONResponseV0.cxx b/MUON/AliMUONResponseV0.cxx index 970c5ebc01c..662cb00c52b 100644 --- a/MUON/AliMUONResponseV0.cxx +++ b/MUON/AliMUONResponseV0.cxx @@ -21,6 +21,7 @@ #include "AliMUONResponseV0.h" #include "AliSegmentation.h" + ClassImp(AliMUONResponseV0) //__________________________________________________________________________ diff --git a/MUON/AliMUONSDigitizerv1.cxx b/MUON/AliMUONSDigitizerv1.cxx index ece2293e79a..577e0f350af 100644 --- a/MUON/AliMUONSDigitizerv1.cxx +++ b/MUON/AliMUONSDigitizerv1.cxx @@ -30,6 +30,7 @@ #include "AliMUONData.h" #include "AliMUONDigit.h" #include "AliMUONTransientDigit.h" +#include "AliLog.h" ClassImp(AliMUONSDigitizerv1) @@ -65,8 +66,7 @@ void AliMUONSDigitizerv1::AddDigit(Int_t chamber, Int_t tracks[kMAXTRACKS], Int_ Int_t AliMUONSDigitizerv1::GetSignalFrom(AliMUONTransientDigit* td) { // Returns the transient digit signal as is without applying the chamber response. - - if (GetDebug() > 3) Info("GetSignalFrom", "Returning TransientDigit signal."); + AliDebug(4,"Returning TransientDigit signal."); return td->Signal(); }; @@ -74,9 +74,7 @@ Int_t AliMUONSDigitizerv1::GetSignalFrom(AliMUONTransientDigit* td) Bool_t AliMUONSDigitizerv1::InitOutputData(AliMUONLoader* muonloader) { // Overridden to initialise the output tree to be TreeS rather than TreeD. - - if (GetDebug() > 2) - Info("InitOutputData", "Creating s-digits branch and setting the tree address."); + AliDebug(3,"Creating s-digits branch and setting the tree address."); fMUONData->SetLoader(muonloader); @@ -86,7 +84,7 @@ Bool_t AliMUONSDigitizerv1::InitOutputData(AliMUONLoader* muonloader) muonloader->MakeSDigitsContainer(); if (muonloader->TreeS() == NULL) { - Error("InitOutputData", "Could not create TreeS."); + AliError("Could not create TreeS."); return kFALSE; }; }; @@ -102,7 +100,7 @@ void AliMUONSDigitizerv1::FillOutputData() { // Overridden to fill TreeS rather than TreeD. - if (GetDebug() > 2) Info("FillOutputData", "Filling trees with s-digits."); + AliDebug(3,"Filling trees with s-digits."); fMUONData->Fill("S"); fMUONData->ResetSDigits(); }; @@ -111,8 +109,7 @@ void AliMUONSDigitizerv1::FillOutputData() void AliMUONSDigitizerv1::CleanupOutputData(AliMUONLoader* muonloader) { // Overridden to write and then cleanup TreeS that was initialised in InitOutputData. - - if (GetDebug() > 2) Info("CleanupOutputData", "Writing s-digits and releasing pointers."); + AliDebug(3,"Writing s-digits and releasing pointers."); muonloader->WriteSDigits("OVERWRITE"); fMUONData->ResetSDigits(); muonloader->UnloadSDigits(); diff --git a/MUON/AliMUONSegment.cxx b/MUON/AliMUONSegment.cxx index 134d5cf4e67..9dfee15ae2c 100644 --- a/MUON/AliMUONSegment.cxx +++ b/MUON/AliMUONSegment.cxx @@ -32,6 +32,7 @@ #include "AliMUONHitForRec.h" #include "AliMUONTrackParam.h" #include "AliRun.h" // for gAlice +#include "AliLog.h" ClassImp(AliMUONSegment) // Class implementation in ROOT context @@ -106,7 +107,7 @@ AliMUONSegment::AliMUONSegment (const AliMUONSegment& theMUONSegment) { // Protected copy constructor - Fatal("AliMUONSegment", "Not implemented."); + AliFatal("Not implemented."); } AliMUONSegment & AliMUONSegment::operator=(const AliMUONSegment& rhs) @@ -115,7 +116,7 @@ AliMUONSegment & AliMUONSegment::operator=(const AliMUONSegment& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONSegmentIndex.cxx b/MUON/AliMUONSegmentIndex.cxx index 3e3ec094324..98ee5bb14dd 100644 --- a/MUON/AliMUONSegmentIndex.cxx +++ b/MUON/AliMUONSegmentIndex.cxx @@ -28,6 +28,7 @@ #include #include "AliMUONSegmentIndex.h" +#include "AliLog.h" //___________________________________________ ClassImp(AliMUONSegmentIndex) @@ -78,5 +79,5 @@ TString AliMUONSegmentIndex::Name(Int_t padx, Int_t pady, Int_t cathode) void AliMUONSegmentIndex::Print() const { // Printing information of AliMUONSegmentIndex - Info("Print", "Name=%s Id=%d PadX=%d PadY=%d Cathode=%d\n",fName.Data(),fChannelId,fPadX,fPadY,fCathode); + AliInfo(Form("Name=%s Id=%d PadX=%d PadY=%d Cathode=%d\n",fName.Data(),fChannelId,fPadX,fPadY,fCathode)); } diff --git a/MUON/AliMUONSegmentManuIndex.cxx b/MUON/AliMUONSegmentManuIndex.cxx index 038922d91d1..8e068f9a5da 100644 --- a/MUON/AliMUONSegmentManuIndex.cxx +++ b/MUON/AliMUONSegmentManuIndex.cxx @@ -28,6 +28,7 @@ #include #include "AliMUONSegmentManuIndex.h" +#include "AliLog.h" //___________________________________________ ClassImp(AliMUONSegmentManuIndex) @@ -78,5 +79,5 @@ TString AliMUONSegmentManuIndex::Name(Int_t manuid, Int_t manuchannel) void AliMUONSegmentManuIndex::Print() const { // Printing AliMUONSegmentManuIndex information - Info("Print","Name=%s Id=%d BusPatch=%d ManuId=%d ManuChannelId=%d\n",fName.Data(),fChannelId,fBusPatchId,fManuId,fManuChannelId); + AliInfo(Form("Name=%s Id=%d BusPatch=%d ManuId=%d ManuChannelId=%d\n",fName.Data(),fChannelId,fBusPatchId,fManuId,fManuChannelId)); } diff --git a/MUON/AliMUONSegmentPosition.cxx b/MUON/AliMUONSegmentPosition.cxx index 5aae59562dc..c3b52e3b948 100644 --- a/MUON/AliMUONSegmentPosition.cxx +++ b/MUON/AliMUONSegmentPosition.cxx @@ -28,6 +28,7 @@ #include #include "AliMUONSegmentPosition.h" +#include "AliLog.h" //___________________________________________ ClassImp(AliMUONSegmentPosition) @@ -93,5 +94,5 @@ TString AliMUONSegmentPosition::Name(Float_t x, Float_t y, Int_t cathode) void AliMUONSegmentPosition::Print() const { // Printing AliMUONSegmentManuIndex information - Info("Print","Name=%s Id=%d X=%f Y=%f Cathode=%d\n",fName.Data(),fChannelId, fX, fY,fCathode); + AliInfo(Form("Name=%s Id=%d X=%f Y=%f Cathode=%d\n",fName.Data(),fChannelId, fX, fY,fCathode)); } diff --git a/MUON/AliMUONSegmentationDetectionElement.cxx b/MUON/AliMUONSegmentationDetectionElement.cxx index 373d6270fdb..43b45c7e6fa 100644 --- a/MUON/AliMUONSegmentationDetectionElement.cxx +++ b/MUON/AliMUONSegmentationDetectionElement.cxx @@ -41,6 +41,7 @@ #include "AliMUONSegmentManuIndex.h" #include "AliMUONSegmentPosition.h" #include "AliMUONSegmentIndex.h" +#include "AliLog.h" //___________________________________________ ClassImp(AliMUONSegmentationDetectionElement) @@ -81,7 +82,7 @@ AliMUONSegmentationDetectionElement::AliMUONSegmentationDetectionElement(const A { // Protected copy constructor - Fatal("AliMUONSegmentationDetectionElementModule", "Not implemented."); + AliFatal("Not implemented."); } //_________________________________________________ AliMUONSegmentationDetectionElement::~AliMUONSegmentationDetectionElement(){ @@ -131,7 +132,7 @@ AliMUONSegmentIndex * AliMUONSegmentationDetectionElement::FindIndexFromPositio } } if (!foundsegmentindex) { - Warning("FindIndexFromPosition","Not found Index for position x=%5.2f y=%5.2f \n",x,y); + AliWarning(Form("Not found Index for position x=%5.2f y=%5.2f \n",x,y)); } return foundsegmentindex; } @@ -157,8 +158,8 @@ AliMUONSegmentIndex * AliMUONSegmentationDetectionElement::GetIndex( const char // Getting AliMUONSegmentIndex from name of AliMUONSegmentManuIndex if (fMapManuIndexIndex) return (AliMUONSegmentIndex*) fMapManuIndexIndex->GetValue(SegmentManuIndexName); else { - Warning("GetIndex","SegmentManuIndex %s out of DetectionElement Mapping %s", - SegmentManuIndexName,fDetectionElementType.Data()); + AliWarning(Form("SegmentManuIndex %s out of DetectionElement Mapping %s", + SegmentManuIndexName,fDetectionElementType.Data())); return 0x0; } } @@ -174,8 +175,8 @@ AliMUONSegmentManuIndex * AliMUONSegmentationDetectionElement::GetManuIndex( con // Getting ManuIndex from manuname if (fMapIndexManuIndex) return (AliMUONSegmentManuIndex*) fMapIndexManuIndex->GetValue(SegmentIndexName); else { - Warning("GetManuIndex","SegmentIndex %s out of Detection Element mapping %s", - SegmentIndexName,fDetectionElementType.Data()); + AliWarning(Form("SegmentIndex %s out of Detection Element mapping %s", + SegmentIndexName,fDetectionElementType.Data())); return 0x0; } } @@ -196,7 +197,7 @@ void AliMUONSegmentationDetectionElement::GetPadI(Float_t x, Float_t y, Int_t c pady = segmentindex->GetPadY(); } else { - Warning("GetPadI","Not found Index for position x=%5.2f y=%5.2f \n",x,y); + AliWarning(Form("Not found Index for position x=%5.2f y=%5.2f \n",x,y)); } } //_________________________________________________ @@ -211,8 +212,8 @@ AliMUONSegmentPosition * AliMUONSegmentationDetectionElement::GetPosition( cons // Getting position from indexname if (fMapIndexPosition) return (AliMUONSegmentPosition*) fMapIndexPosition->GetValue(SegmentIndexName); else { - Warning("GetPosition","SegmentIndex %s out of DetectionElement mapping %s", - SegmentIndexName, fDetectionElementType.Data()); + AliWarning(Form("SegmentIndex %s out of DetectionElement mapping %s", + SegmentIndexName, fDetectionElementType.Data())); return 0x0; } } @@ -228,8 +229,8 @@ AliMUONSegmentIndex * AliMUONSegmentationDetectionElement::GetIndexFromPosition( // Getting index form positionname if (fMapPositionIndex) return (AliMUONSegmentIndex*) fMapPositionIndex->GetValue(PositionName); else { - Warning("GetIndexFromPosition","SegmentPosition %s out of DetectionElement Mapping %s", - PositionName,fDetectionElementType.Data()); + AliWarning(Form("SegmentPosition %s out of DetectionElement Mapping %s", + PositionName,fDetectionElementType.Data())); return 0x0; } } @@ -240,8 +241,8 @@ AliMUONSegmentManuIndex * AliMUONSegmentationDetectionElement::FindManuIndex( co // Getting AliMUONSegmentManuIndex objecto from manu index if (fMapManuIndexIndex) return (AliMUONSegmentManuIndex*) fMapManuIndexIndex->FindObject(ManuIndexName); else { - Warning("FindManuIndex","SegmentManuIndex %s out of DetectionElement mapping %s", - ManuIndexName,fDetectionElementType.Data()); + AliWarning(Form("SegmentManuIndex %s out of DetectionElement mapping %s", + ManuIndexName,fDetectionElementType.Data())); return 0x0; } } @@ -252,8 +253,8 @@ AliMUONSegmentIndex * AliMUONSegmentationDetectionElement::FindIndex(const char* // Getting if (fMapIndexPosition) return (AliMUONSegmentIndex *) fMapIndexPosition->FindObject(IndexName); else { - Warning("FindIndex","SegmentIndex %s out of DetectionElement mapping %s", - IndexName,fDetectionElementType.Data()); + AliWarning(Form("SegmentIndex %s out of DetectionElement mapping %s", + IndexName,fDetectionElementType.Data())); return 0x0; } } @@ -287,11 +288,11 @@ void AliMUONSegmentationDetectionElement::Init(const char * DetectionElementT Int_t icathode; //Bendingplane icathode=0; - Info("ReadingSegmentationMappingFile","%s", fSegmentationMappingFileBending.Data()); + AliInfo(Form("%s", fSegmentationMappingFileBending.Data())); ReadingSegmentationMappingFile(fSegmentationMappingFileBending ,icathode); //NonBendingplane icathode=1; - Info("Init","Reading mapping file is %s\n", fSegmentationMappingFileNonBending.Data()); + AliInfo(Form("Reading mapping file is %s\n", fSegmentationMappingFileNonBending.Data())); ReadingSegmentationMappingFile(fSegmentationMappingFileNonBending,icathode); } @@ -300,7 +301,7 @@ void AliMUONSegmentationDetectionElement::ReadingSegmentationMappingFile(TString { ifstream in( infile, ios::in); if (!in) { - Error("ReadingSegmentationMappingFile", "File not found."); + AliError("File not found."); } else { Int_t id, ix, iy, idmanu, idchannel; diff --git a/MUON/AliMUONSegmentationSlat.cxx b/MUON/AliMUONSegmentationSlat.cxx index 22fa022d8e0..c847cb73be0 100644 --- a/MUON/AliMUONSegmentationSlat.cxx +++ b/MUON/AliMUONSegmentationSlat.cxx @@ -28,6 +28,7 @@ #include "AliMUONChamber.h" #include "AliRun.h" #include "AliMUONConstants.h" +#include "AliLog.h" //___________________________________________ ClassImp(AliMUONSegmentationSlat) @@ -56,7 +57,7 @@ AliMUONSegmentationSlat::AliMUONSegmentationSlat(const AliMUONSegmentationSlat& { // Protected copy constructor - Fatal("AliMUONSegmentationSlatModule", "Not implemented."); + AliFatal("Not implemented."); } AliMUONSegmentationSlat::~AliMUONSegmentationSlat(){ @@ -80,7 +81,7 @@ AliMUONSegmentationSlat::operator=(const AliMUONSegmentationSlat& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONSegmentationSlatModule.cxx b/MUON/AliMUONSegmentationSlatModule.cxx index 7988c2cfab8..8b599d82c7e 100644 --- a/MUON/AliMUONSegmentationSlatModule.cxx +++ b/MUON/AliMUONSegmentationSlatModule.cxx @@ -24,6 +24,7 @@ #include #include "AliMUONSegmentationSlatModule.h" +#include "AliLog.h" //___________________________________________ ClassImp(AliMUONSegmentationSlatModule) @@ -54,7 +55,7 @@ AliMUONSegmentationSlatModule::AliMUONSegmentationSlatModule( { // Protected copy constructor - Fatal("AliMUONSegmentationSlatModule", "Not implemented."); + AliFatal("Not implemented."); } @@ -74,7 +75,7 @@ AliMUONSegmentationSlatModule::operator=( if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONSegmentationTrigger.cxx b/MUON/AliMUONSegmentationTrigger.cxx index 289cc1c5018..d3b26e01053 100644 --- a/MUON/AliMUONSegmentationTrigger.cxx +++ b/MUON/AliMUONSegmentationTrigger.cxx @@ -26,6 +26,7 @@ #include "AliRun.h" #include "AliMUON.h" #include "AliMUONChamber.h" +#include "AliLog.h" ClassImp(AliMUONSegmentationTrigger) @@ -45,7 +46,7 @@ void AliMUONSegmentationTrigger::Init(Int_t chamber) AliMUON *pMUON = (AliMUON *) gAlice->GetModule("MUON"); AliMUONChamber* iChamber=&(pMUON->Chamber(chamber)); - if(pMUON->GetDebug()>1) printf("%s: Initialize Trigger Chamber Module Geometry\n",ClassName()); + AliDebug(2,"Initialize Trigger Chamber Module Geometry"); Float_t zPos=iChamber->Z(); Float_t z1Pos=AliMUONConstants::DefaultChamberZ(10); //cp changed @@ -61,8 +62,7 @@ void AliMUONSegmentationTrigger::Init(Int_t chamber) Float_t z1pm=z1PosPlus/z1PosMinus; Float_t z1mp=z1PosMinus/z1PosPlus; - if(pMUON->GetDebug()>1) printf("%s: fZscale = %f \n",ClassName(),fZscale); - + AliDebug(2,Form("fZscale = %f ",fZscale)); // calculate yCmin and fYcmax Int_t i; for (i=62; i>=0; i--) { diff --git a/MUON/AliMUONSegmentationTriggerX.cxx b/MUON/AliMUONSegmentationTriggerX.cxx index bb54e5bd00b..96813e09e0f 100644 --- a/MUON/AliMUONSegmentationTriggerX.cxx +++ b/MUON/AliMUONSegmentationTriggerX.cxx @@ -25,6 +25,7 @@ #include "AliMUONTriggerConstants.h" #include "AliMUONChamber.h" #include "AliRun.h" // gAlice +#include "AliLog.h" ClassImp(AliMUONSegmentationTriggerX) @@ -32,8 +33,7 @@ ClassImp(AliMUONSegmentationTriggerX) void AliMUONSegmentationTriggerX::Init(Int_t chamber) { // intialize X segmentation - AliMUON *pMUON = (AliMUON *) gAlice->GetModule("MUON"); - if(pMUON->GetDebug()>1) printf("%s: Initialize Trigger Chamber Geometry X\n",ClassName()); + AliDebug(2,"Initialize Trigger Chamber Geometry X"); AliMUONSegmentationTrigger::Init(chamber); // calculate x & y position of X strips diff --git a/MUON/AliMUONSegmentationTriggerY.cxx b/MUON/AliMUONSegmentationTriggerY.cxx index d6c6507eb6c..4060d55d525 100644 --- a/MUON/AliMUONSegmentationTriggerY.cxx +++ b/MUON/AliMUONSegmentationTriggerY.cxx @@ -21,6 +21,7 @@ #include "AliMUONTriggerConstants.h" #include "AliMUON.h" #include "AliRun.h" +#include "AliLog.h" ClassImp(AliMUONSegmentationTriggerY) @@ -35,8 +36,7 @@ AliMUONSegmentationTriggerY::AliMUONSegmentationTriggerY() void AliMUONSegmentationTriggerY::Init(Int_t chamber) { // intialize Y segmentation - AliMUON *pMUON = (AliMUON *) gAlice->GetModule("MUON"); - if(pMUON->GetDebug()>1) printf("%s: Initialize Trigger Chamber Geometry Y\n",ClassName()); + AliDebug(2,"Initialize Trigger Chamber Geometry Y"); AliMUONSegmentationTrigger::Init(chamber); // calculate x & y position of Y strips diff --git a/MUON/AliMUONSegmentationV0.cxx b/MUON/AliMUONSegmentationV0.cxx index cc70079e4b3..6f87562db7f 100644 --- a/MUON/AliMUONSegmentationV0.cxx +++ b/MUON/AliMUONSegmentationV0.cxx @@ -22,6 +22,7 @@ #include "AliMUONChamber.h" #include "AliRun.h" #include "AliMUON.h" +#include "AliLog.h" ClassImp(AliMUONSegmentationV0) @@ -37,7 +38,7 @@ AliMUONSegmentationV0::AliMUONSegmentationV0(const AliMUONSegmentationV0& segmen { // Protected copy constructor - Fatal("AliMUONSegmentationV0", "Not implemented."); + AliFatal("Not implemented."); } @@ -340,7 +341,7 @@ AliMUONSegmentationV0::operator =(const AliMUONSegmentationV0 & rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONSegmentationV01.cxx b/MUON/AliMUONSegmentationV01.cxx index 758f32a8733..9b918623631 100644 --- a/MUON/AliMUONSegmentationV01.cxx +++ b/MUON/AliMUONSegmentationV01.cxx @@ -32,6 +32,7 @@ #include "AliMUON.h" #include "AliMUONChamber.h" #include "AliRun.h" +#include "AliLog.h" @@ -43,7 +44,7 @@ AliMUONSegmentationV01::AliMUONSegmentationV01(const AliMUONSegmentationV01& seg { // Protected copy constructor - Fatal("AliMUONSegmentationV01", "Not implemented."); + AliFatal("Not implemented."); } AliMUONSegmentationV01::AliMUONSegmentationV01() @@ -678,7 +679,7 @@ AliMUONSegmentationV01::operator =(const AliMUONSegmentationV01 & rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONSlatGeometryBuilder.cxx b/MUON/AliMUONSlatGeometryBuilder.cxx index 58ea345e091..28222fd706c 100644 --- a/MUON/AliMUONSlatGeometryBuilder.cxx +++ b/MUON/AliMUONSlatGeometryBuilder.cxx @@ -28,6 +28,7 @@ #include "AliMUONGeometryEnvelopeStore.h" #include "AliMUONConstants.h" #include "AliRun.h" +#include "AliLog.h" ClassImp(AliMUONSlatGeometryBuilder) @@ -57,8 +58,7 @@ AliMUONSlatGeometryBuilder::AliMUONSlatGeometryBuilder() AliMUONSlatGeometryBuilder::AliMUONSlatGeometryBuilder(const AliMUONSlatGeometryBuilder& rhs) : AliMUONVGeometryBuilder(rhs) { - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -73,8 +73,7 @@ AliMUONSlatGeometryBuilder::operator = (const AliMUONSlatGeometryBuilder& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } diff --git a/MUON/AliMUONSt1GeometryBuilder.cxx b/MUON/AliMUONSt1GeometryBuilder.cxx index c8ad0fa4d54..e282d875447 100644 --- a/MUON/AliMUONSt1GeometryBuilder.cxx +++ b/MUON/AliMUONSt1GeometryBuilder.cxx @@ -15,6 +15,7 @@ #include "AliMUONChamber.h" #include "AliMUONChamberGeometry.h" #include "AliMUONGeometryEnvelopeStore.h" +#include "AliLog.h" ClassImp(AliMUONSt1GeometryBuilder) @@ -43,8 +44,7 @@ AliMUONSt1GeometryBuilder::AliMUONSt1GeometryBuilder(const AliMUONSt1GeometryBui { // Protected copy constructor - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -61,8 +61,7 @@ AliMUONSt1GeometryBuilder::operator = (const AliMUONSt1GeometryBuilder& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } diff --git a/MUON/AliMUONSt1GeometryBuilderV2.cxx b/MUON/AliMUONSt1GeometryBuilderV2.cxx index c177550389b..69d3a77e503 100644 --- a/MUON/AliMUONSt1GeometryBuilderV2.cxx +++ b/MUON/AliMUONSt1GeometryBuilderV2.cxx @@ -55,6 +55,7 @@ #include "AliMUONGeometryEnvelopeStore.h" #include "AliRun.h" #include "AliMagF.h" +#include "AliLog.h" ClassImp(AliMUONSt1GeometryBuilderV2) @@ -142,8 +143,7 @@ AliMUONSt1GeometryBuilderV2::AliMUONSt1GeometryBuilderV2(const AliMUONSt1Geometr { // Dummy copy constructor - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -160,8 +160,7 @@ AliMUONSt1GeometryBuilderV2::operator = (const AliMUONSt1GeometryBuilderV2& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } diff --git a/MUON/AliMUONSt1Response.cxx b/MUON/AliMUONSt1Response.cxx index 74353b05abb..9ac5bd6e34d 100644 --- a/MUON/AliMUONSt1Response.cxx +++ b/MUON/AliMUONSt1Response.cxx @@ -45,6 +45,7 @@ #include "AliMUONSt1IniReader.h" #include "AliMUONSt1Decoder.h" #include "AliMUONTransientDigit.h" +#include "AliLog.h" ClassImp(AliMUONSt1Response); @@ -117,8 +118,7 @@ AliMUONSt1Response::AliMUONSt1Response(const AliMUONSt1Response& rhs) { // Copy constructor - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //__________________________________________________________________________ @@ -146,8 +146,7 @@ AliMUONSt1Response::operator=(const AliMUONSt1Response& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } @@ -174,7 +173,7 @@ void AliMUONSt1Response::ReadCouplesOfIntRanges(const string& value, StringVector lst = decoder::SplitList(lstCpl[n],","); // should have 2 elements if (lst.size() != 2) { - Warning("ReadIniFile","Bad pad definition"); + AliWarning("Bad pad definition"); continue; } IntPairVector lst1 = decoder::DecodeListOfIntRanges(lst[0],";"); @@ -206,7 +205,7 @@ void AliMUONSt1Response::ReadCouplesOfFloatRanges(const string& value, StringVector lst = decoder::SplitList(lstCpl[n],","); // should have 2 elements if (lst.size() != 2) { - Warning("ReadIniFile","Bad pad definition"); + AliWarning("Bad pad definition"); continue; } DoublePairVector lst1 = decoder::DecodeListOfFloatRanges(lst[0],";"); @@ -311,8 +310,7 @@ void AliMUONSt1Response::ReadIniFile(Int_t plane) TString path = fgkTopDir + fgkDataDir ; //read .ini file if (gSystem->AccessPathName(path+fIniFileName[plane],kReadPermission)){ - Fatal("ReadIniFile", - Form("Unable to Read the file %s",fIniFileName[plane].Data())); + AliFatal(Form("Unable to Read the file %s",fIniFileName[plane].Data())); return; } fRegions.clear(); @@ -420,7 +418,7 @@ void AliMUONSt1Response::ReadIniFile(Int_t plane,const TString& fileName, while ((el = static_cast(next()))){ rule->AddElement(el); } - } else Warning("ReadIniFile",Form("Can't find region named %s",value.c_str())); + } else AliWarning(Form("Can't find region named %s",value.c_str())); } } for (itValue = vals.begin() ; itValue != vals.end(); ++itValue){ @@ -434,7 +432,7 @@ void AliMUONSt1Response::ReadIniFile(Int_t plane,const TString& fileName, fDefaultParameters[plane][i]=param; } if (rule) rule->AddParameter(param); - } else Warning("ReadIniFile",Form("Can't find parameter named %s",value.c_str())); + } else AliWarning(Form("Can't find parameter named %s",value.c_str())); } } if (rule) fRulesList[plane].AddFirst(rule); diff --git a/MUON/AliMUONSt1ResponseParameter.cxx b/MUON/AliMUONSt1ResponseParameter.cxx index 3d519b3b4ee..2017852b1c1 100644 --- a/MUON/AliMUONSt1ResponseParameter.cxx +++ b/MUON/AliMUONSt1ResponseParameter.cxx @@ -31,6 +31,7 @@ #include #include "AliMUONSt1ResponseParameter.h" +#include "AliLog.h" ClassImp(AliMUONSt1ResponseParameter); @@ -110,7 +111,7 @@ void AliMUONSt1ResponseParameter::SetPedestal(const TString& fileName) } file.close(); } else { - Warning("SetPedestal",Form("Can't read file %s",fileName.Data())); + AliWarning(Form("Can't read file %s",fileName.Data())); SetPedestal(150.,10.); } } @@ -162,7 +163,7 @@ void AliMUONSt1ResponseParameter::SetNoise(const TString& fileName) } file.close(); } else { - Warning("SetNoise",Form("Can't read file %s",fileName.Data())); + AliWarning(Form("Can't read file %s",fileName.Data())); SetNoise(150.,10.); } } @@ -238,6 +239,6 @@ Double_t AliMUONSt1ResponseParameter::Choose(TMode mode,TParam param,Int_t GC) c case kGauss : return gRandom->Gaus(param.gauss.mean,param.gauss.sigma); case kFile : return param.values[GC]; } - Fatal("Choose","No mode is given"); + AliFatal("No mode is given"); return 0; } diff --git a/MUON/AliMUONSt1ResponseRule.cxx b/MUON/AliMUONSt1ResponseRule.cxx index d95277b1749..77c7cf38b0b 100644 --- a/MUON/AliMUONSt1ResponseRule.cxx +++ b/MUON/AliMUONSt1ResponseRule.cxx @@ -30,7 +30,6 @@ #include "AliMUONSt1ResponseRule.h" #include "AliMUONSt1ElectronicElement.h" #include "AliMUONSt1ResponseParameter.h" - ClassImp(AliMUONSt1ResponseRule); //__________________________________________________________________________ diff --git a/MUON/AliMUONSt1Segmentation.cxx b/MUON/AliMUONSt1Segmentation.cxx index b1c10046d70..f975bd38dbc 100644 --- a/MUON/AliMUONSt1Segmentation.cxx +++ b/MUON/AliMUONSt1Segmentation.cxx @@ -37,6 +37,7 @@ #include "AliRun.h" #include "AliMUON.h" #include "AliMUONChamber.h" +#include "AliLog.h" ClassImp(AliMUONSt1Segmentation) @@ -112,8 +113,7 @@ AliMUONSt1Segmentation::AliMUONSt1Segmentation(const AliMUONSt1Segmentation& rhs : AliSegmentation(rhs) { // Copy constructor - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -138,8 +138,7 @@ AliMUONSt1Segmentation::operator=(const AliMUONSt1Segmentation& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } @@ -171,7 +170,7 @@ void AliMUONSt1Segmentation::SetPadSize(Float_t /*p1*/, Float_t /*p2*/) // Set pad size Dx*Dy // --- - Fatal("SetPadSize", "Not uniform pad size."); + AliFatal("Not uniform pad size."); } //______________________________________________________________________________ @@ -271,7 +270,7 @@ Float_t AliMUONSt1Segmentation::Dpx() const // Get pad size in x // --- - Fatal("Dpx", "Not uniform pad size."); + AliFatal( "Not uniform pad size."); return 0.; } @@ -281,7 +280,7 @@ Float_t AliMUONSt1Segmentation::Dpy() const // Get pad size in y // --- - Fatal("Dpy", "Not uniform pad size."); + AliFatal("Not uniform pad size."); return 0.; } @@ -409,7 +408,7 @@ Float_t AliMUONSt1Segmentation::Distance2AndOffset(Int_t iX, Int_t iY, AliMpPad pad = fPlaneSegmentation->PadByIndices(AliMpIntPair(iX, iY)); if (!pad.IsValid()) - Fatal("Distance2AndOffset", "Cannot locate pad."); + AliFatal("Cannot locate pad."); return (pad.Position()*fgkLengthUnit - TVector2(x, y)).Mod2(); } @@ -422,7 +421,7 @@ void AliMUONSt1Segmentation::GetNParallelAndOffset(Int_t /*iX*/, Int_t /*iY*/, // (specific to LYON, but mandatory for display) // --- - Fatal("GetNParallelAndOffset", "Not yet implemented."); + AliFatal( "Not yet implemented."); } @@ -581,7 +580,7 @@ void AliMUONSt1Segmentation::Draw(const char * /*opt*/) const // (Called from AliMUON::BuildGeometry) // --- - Warning("Draw", "Not yet implemented."); + AliWarning("Not yet implemented."); } //______________________________________________________________________________ diff --git a/MUON/AliMUONSt1SpecialMotif.cxx b/MUON/AliMUONSt1SpecialMotif.cxx index db9ed4491a0..78f8912ed93 100644 --- a/MUON/AliMUONSt1SpecialMotif.cxx +++ b/MUON/AliMUONSt1SpecialMotif.cxx @@ -25,6 +25,7 @@ #include "AliMUONSt1SpecialMotif.h" + //__________________________________________________________________________ AliMUONSt1SpecialMotif::AliMUONSt1SpecialMotif(const TVector2& delta, Double_t rotAngle) diff --git a/MUON/AliMUONSt2GeometryBuilder.cxx b/MUON/AliMUONSt2GeometryBuilder.cxx index 8de152d3b51..aa3237b9163 100644 --- a/MUON/AliMUONSt2GeometryBuilder.cxx +++ b/MUON/AliMUONSt2GeometryBuilder.cxx @@ -30,6 +30,7 @@ #include "AliMUONChamber.h" #include "AliMUONChamberGeometry.h" #include "AliMUONGeometryEnvelopeStore.h" +#include "AliLog.h" ClassImp(AliMUONSt2GeometryBuilder) @@ -58,8 +59,7 @@ AliMUONSt2GeometryBuilder::AliMUONSt2GeometryBuilder(const AliMUONSt2GeometryBui { // Protected copy constructor - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -76,8 +76,7 @@ AliMUONSt2GeometryBuilder::operator = (const AliMUONSt2GeometryBuilder& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } diff --git a/MUON/AliMUONSubEventTracker.cxx b/MUON/AliMUONSubEventTracker.cxx index 333b883c92a..12c710608cb 100644 --- a/MUON/AliMUONSubEventTracker.cxx +++ b/MUON/AliMUONSubEventTracker.cxx @@ -12,7 +12,7 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ - + #include "AliMUONSubEventTracker.h" ClassImp(AliMUONSubEventTracker) diff --git a/MUON/AliMUONSubEventTrigger.cxx b/MUON/AliMUONSubEventTrigger.cxx index 5146832ff8b..30b705499c6 100644 --- a/MUON/AliMUONSubEventTrigger.cxx +++ b/MUON/AliMUONSubEventTrigger.cxx @@ -15,6 +15,7 @@ #include "AliMUONSubEventTrigger.h" + ClassImp(AliMUONSubEventTrigger) //___________________________________________ diff --git a/MUON/AliMUONTrackHit.cxx b/MUON/AliMUONTrackHit.cxx index e94748d1866..5d03a89d420 100644 --- a/MUON/AliMUONTrackHit.cxx +++ b/MUON/AliMUONTrackHit.cxx @@ -27,6 +27,7 @@ #include "AliMUONTrackHit.h" #include "AliMUONHitForRec.h" +#include "AliLog.h" ClassImp(AliMUONTrackHit) // Class implementation in ROOT context @@ -84,7 +85,6 @@ AliMUONTrackHit::AliMUONTrackHit(AliMUONHitForRec* Hit) fNextTrackHitWithSameHitForRec = NULL; Hit->SetNTrackHits(Hit->GetNTrackHits() + 1); } - //__________________________________________________________________________ AliMUONTrackHit::~AliMUONTrackHit() { diff --git a/MUON/AliMUONTrackK.cxx b/MUON/AliMUONTrackK.cxx index 84b06e5b141..4e841b98771 100644 --- a/MUON/AliMUONTrackK.cxx +++ b/MUON/AliMUONTrackK.cxx @@ -29,6 +29,7 @@ #include "AliMUONRawCluster.h" #include "AliMUONTrackParam.h" #include "AliRun.h" +#include "AliLog.h" //#include "AliMagF.h" const Int_t AliMUONTrackK::fgkSize = 5; @@ -224,7 +225,7 @@ AliMUONTrackK::AliMUONTrackK (const AliMUONTrackK& source) { // Protected copy constructor - Fatal("AliMUONTrackK", "Not implemented."); + AliFatal("Not implemented."); } //__________________________________________________________________________ @@ -299,7 +300,7 @@ void AliMUONTrackK::EvalCovariance(Double_t dZ) Int_t ifailWeight; mnvertLocalK(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifailWeight); } else { - cout << " ***** Warning in EvalCovariance: Determinant fWeight=0:" << endl; + AliWarning(" Determinant fWeight=0:"); } return; } @@ -678,7 +679,7 @@ void AliMUONTrackK::WeightPropagation(Double_t zEnd) Int_t ifailCov; mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov); } else { - cout << " ***** Warning in WeightPropagation: Determinant fCovariance=0:" << endl; + AliWarning(" Determinant fCovariance=0:"); } // Loop over parameters to find change of the initial vs propagated ones @@ -740,7 +741,7 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int Int_t ifailCov; mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov); } else { - cout << " ***** Warning in FindPoint: Determinant fCovariance=0:" << endl; + AliWarning("Determinant fCovariance=0:"); } //windowB = fgkNSigma*TMath::Sqrt((*fCovariance)(0,0)+sigmaB*sigmaB); //windowNonB = fgkNSigma*TMath::Sqrt((*fCovariance)(1,1)+sigmaNonB*sigmaNonB); @@ -774,7 +775,7 @@ Bool_t AliMUONTrackK::FindPoint(Int_t ichamb, Double_t zEnd, Int_t currIndx, Int Int_t ifailCov; mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov); } else { - cout << " ***** Warning in FindPoint: Determinant fCovariance=0:" << endl; + AliWarning("Determinant fCovariance=0:"); } } y = hit->GetBendingCoor(); @@ -882,7 +883,7 @@ void AliMUONTrackK::TryPoint(TMatrixD &point, const TMatrixD &pointWeight, TMatr Int_t ifailWU; mnvertLocalK(&((wu)(0,0)), fgkSize,fgkSize,fgkSize,ifailWU); } else { - cout << " ***** Warning in TryPoint: Determinant wu=0:" << endl; + AliWarning("Determinant wu=0:"); } trackParTmp = TMatrixD(wu,TMatrixD::kMult,right); @@ -913,7 +914,7 @@ void AliMUONTrackK::MSThin(Int_t sign) Int_t ifailWeight; mnvertLocalK(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifailWeight); } else { - cout << " ***** Warning in MSThin: Determinant fWeight=0:" << endl; + AliWarning("Determinant fWeight=0:"); } cosAlph = TMath::Cos((*fTrackParNew)(2,0)); @@ -1082,7 +1083,7 @@ void AliMUONTrackK::Branson(void) Int_t ifailCov; mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov); } else { - cout << " ***** Warning in Branson: Determinant fCovariance=0:" << endl; + AliWarning("Determinant fCovariance=0:"); } } @@ -1263,7 +1264,7 @@ void AliMUONTrackK::GoToVertex(void) Int_t ifailCov; mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov); } else { - cout << " ***** Warning in GoToVertex: Determinant fCovariance=0:" << endl; + AliWarning("Determinant fCovariance=0:" ); } } @@ -1305,7 +1306,7 @@ void AliMUONTrackK::MSLine(Double_t dZ, Double_t x0) Int_t ifailCov; mnvertLocalK(&((*fCovariance)(0,0)), fgkSize,fgkSize,fgkSize,ifailCov); } else { - cout << " ***** Warning in MSLine: Determinant fCovariance=0:" << endl; + AliWarning("Determinant fCovariance=0:" ); } (*fCovariance)(0,0) += dl3*(dYdT*dYdT+dYdB*dYdB); // @@ -1339,7 +1340,7 @@ void AliMUONTrackK::MSLine(Double_t dZ, Double_t x0) Int_t ifailWeight; mnvertLocalK(&((*fWeight)(0,0)), fgkSize,fgkSize,fgkSize,ifailWeight); } else { - cout << " ***** Warning in MSLine: Determinant fWeight=0:" << endl; + AliWarning("Determinant fWeight=0:"); } } diff --git a/MUON/AliMUONTrackParam.cxx b/MUON/AliMUONTrackParam.cxx index f05505a548a..f0019f7313a 100644 --- a/MUON/AliMUONTrackParam.cxx +++ b/MUON/AliMUONTrackParam.cxx @@ -33,6 +33,7 @@ #include "AliMUONChamber.h" #include "AliRun.h" #include "AliMagF.h" +#include "AliLog.h" ClassImp(AliMUONTrackParam) // Class implementation in ROOT context @@ -231,9 +232,10 @@ void AliMUONTrackParam::ExtrapToStation(Int_t Station, AliMUONTrackParam *TrackP if ((z1 > this->fZ) && (z2 > this->fZ)) {i1 = 0; i2 = 1;} else if ((z1 < this->fZ) && (z2 < this->fZ)) {i1 = 1; i2 = 0;} else { - cout << "ERROR in AliMUONTrackParam::CreateExtrapSegmentInStation" << endl; - cout << "Starting Z (" << this->fZ << ") in between z1 (" << z1 << - ") and z2 (" << z2 << ") of station(0..) " << Station << endl; + AliError(Form("Starting Z (%f) in between z1 (%f) and z2 (%f) of station(0..)%d",this->fZ,z1,z2,Station)); +// cout << "ERROR in AliMUONTrackParam::CreateExtrapSegmentInStation" << endl; +// cout << "Starting Z (" << this->fZ << ") in between z1 (" << z1 << +// ") and z2 (" << z2 << ") of station(0..) " << Station << endl; } extZ[i1] = z1; extZ[i2] = z2; diff --git a/MUON/AliMUONTransientDigit.cxx b/MUON/AliMUONTransientDigit.cxx index 865d817789b..5d22b7e3cab 100644 --- a/MUON/AliMUONTransientDigit.cxx +++ b/MUON/AliMUONTransientDigit.cxx @@ -19,6 +19,7 @@ #include #include "AliMUONTransientDigit.h" +#include "AliLog.h" ClassImp(AliMUONTransientDigit) @@ -38,7 +39,7 @@ AliMUONTransientDigit::AliMUONTransientDigit() { // Protected copy constructor - Fatal("AliMUONFTransientDigit", "Not implemented."); + AliFatal( "Not implemented."); } @@ -68,7 +69,7 @@ AliMUONTransientDigit::operator =(const AliMUONTransientDigit& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONTriggerCircuit.cxx b/MUON/AliMUONTriggerCircuit.cxx index 269e9567e1a..767dfc3909a 100644 --- a/MUON/AliMUONTriggerCircuit.cxx +++ b/MUON/AliMUONTriggerCircuit.cxx @@ -24,6 +24,7 @@ #include "AliSegmentation.h" #include "AliMUONChamber.h" #include "AliMUONConstants.h" +#include "AliLog.h" ClassImp(AliMUONTriggerCircuit) @@ -55,7 +56,7 @@ AliMUONTriggerCircuit::AliMUONTriggerCircuit(const AliMUONTriggerCircuit& theMUO { // Protected copy constructor - Fatal("AliMUONTriggerCircuit", "Not implemented."); + AliFatal("Not implemented."); } //---------------------------------------------------------------------- @@ -66,7 +67,7 @@ AliMUONTriggerCircuit::operator=(const AliMUONTriggerCircuit& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } diff --git a/MUON/AliMUONTriggerDecision.cxx b/MUON/AliMUONTriggerDecision.cxx index fb29af618e4..5d221a3f11a 100644 --- a/MUON/AliMUONTriggerDecision.cxx +++ b/MUON/AliMUONTriggerDecision.cxx @@ -29,6 +29,7 @@ #include "AliRunLoader.h" #include "AliLoader.h" #include "AliRawReader.h" // for raw data +#include "AliLog.h" //---------------------------------------------------------------------- @@ -90,11 +91,11 @@ AliMUONTriggerDecision::AliMUONTriggerDecision(AliLoader* loader, Int_t iprint, fLoader = loader; // initialize container - if (data == 0) - Error("TriggerDecision","No MUONdata for trigger\n"); - else + if (data == 0){ + AliError("No MUONdata for trigger"); + }else{ fMUONData = data; - + } // Loading AliRun master AliRunLoader* runloader = fLoader->GetRunLoader(); if (runloader->GetAliRun() == 0x0) runloader->LoadgAlice(); @@ -133,7 +134,7 @@ AliMUONTriggerDecision::AliMUONTriggerDecision(const AliMUONTriggerDecision& rhs { // Protected copy constructor - Fatal("AliMUONTriggerDecision", "Not implemented."); + AliFatal("Not implemented."); } //---------------------------------------------------------------------- @@ -189,7 +190,7 @@ AliMUONTriggerDecision::operator=(const AliMUONTriggerDecision& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal("Not implemented."); return *this; } @@ -296,8 +297,7 @@ void AliMUONTriggerDecision::SetBit(){ TClonesArray *muonDigits = Digits(chamber-1); Int_t ndigits = muonDigits->GetEntriesFast(); - if (fDebug>=3) - printf("\nFound %d digits in %p %d \n", ndigits, (void*)muonDigits,chamber-1); + AliDebug(3,Form("Found %d digits in %p %d", ndigits, (void*)muonDigits,chamber-1)); AliMUONDigit *mdig; @@ -307,8 +307,7 @@ void AliMUONTriggerDecision::SetBit(){ Int_t ix=mdig->PadX(); Int_t iy=mdig->PadY(); cathode = mdig->Cathode() + 1; - if (fDebug>=3) - printf("cathode %d ix %d iy %d \n",cathode,ix,iy); + AliDebug(3,Form("cathode %d ix %d iy %d ",cathode,ix,iy)); // get the sum of the coded charge // see coding convention in AliMUONChamberTrigger::DisIntegration @@ -1454,6 +1453,6 @@ void AliMUONTriggerDecision::Trigger2Trigger(AliRawReader* /*rawReader*/) { // call the Trigger Algorithm from raw data and fill TreeR - Fatal("Trigger2Trigger","Trigger not implemented for raw data input"); + AliFatal("Trigger not implemented for raw data input"); } diff --git a/MUON/AliMUONTriggerGeometryBuilder.cxx b/MUON/AliMUONTriggerGeometryBuilder.cxx index 3eaa2bf98b3..74e78573f2d 100644 --- a/MUON/AliMUONTriggerGeometryBuilder.cxx +++ b/MUON/AliMUONTriggerGeometryBuilder.cxx @@ -29,6 +29,7 @@ #include "AliMUONChamber.h" #include "AliMUONChamberGeometry.h" #include "AliMUONGeometryEnvelopeStore.h" +#include "AliLog.h" ClassImp(AliMUONTriggerGeometryBuilder) @@ -58,8 +59,7 @@ AliMUONTriggerGeometryBuilder::AliMUONTriggerGeometryBuilder(const AliMUONTrigge { // Protected copy constructor - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -76,8 +76,7 @@ AliMUONTriggerGeometryBuilder::operator = (const AliMUONTriggerGeometryBuilder& // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } diff --git a/MUON/AliMUONTriggerLut.cxx b/MUON/AliMUONTriggerLut.cxx index d67d666f6a6..7093f76a761 100644 --- a/MUON/AliMUONTriggerLut.cxx +++ b/MUON/AliMUONTriggerLut.cxx @@ -24,6 +24,7 @@ #include "AliMUONTriggerCircuit.h" #include "AliRun.h" #include "AliMUON.h" +#include "AliLog.h" ClassImp(AliMUONTriggerLut) @@ -59,7 +60,7 @@ AliMUONTriggerLut::AliMUONTriggerLut (const AliMUONTriggerLut& theMUONTriggerLut { // Protected copy constructor - Fatal("AliMUONTriggerLut", "Not implemented."); + AliFatal("Not implemented."); } //---------------------------------------------------------------------- @@ -70,7 +71,7 @@ AliMUONTriggerLut::operator=(const AliMUONTriggerLut& rhs) if (this == &rhs) return *this; - Fatal("operator=", "Not implemented."); + AliFatal( "Not implemented."); return *this; } diff --git a/MUON/AliMUONVGeometryBuilder.cxx b/MUON/AliMUONVGeometryBuilder.cxx index da8d12ecba2..b67db8e2a61 100644 --- a/MUON/AliMUONVGeometryBuilder.cxx +++ b/MUON/AliMUONVGeometryBuilder.cxx @@ -36,6 +36,7 @@ #include "AliMUONGeometryEnvelope.h" #include "AliMUONGeometryConstituent.h" #include "AliMUONConstants.h" +#include "AliLog.h" ClassImp(AliMUONVGeometryBuilder) @@ -84,8 +85,7 @@ AliMUONVGeometryBuilder::AliMUONVGeometryBuilder(const AliMUONVGeometryBuilder& { // Protected copy constructor - Fatal("Copy constructor", - "Copy constructor is not implemented."); + AliFatal("Copy constructor is not implemented."); } //______________________________________________________________________________ @@ -106,8 +106,7 @@ AliMUONVGeometryBuilder::operator = (const AliMUONVGeometryBuilder& rhs) // check assignement to self if (this == &rhs) return *this; - Fatal("operator=", - "Assignment operator is not implemented."); + AliFatal("Assignment operator is not implemented."); return *this; } @@ -180,7 +179,7 @@ void AliMUONVGeometryBuilder::MapSV(const TString& /*path0*/, // and map it to the detection element Id if it is a sensitive volume // --- - Warning("MapSV", "Not yet available"); + AliWarning("Not yet available"); } //______________________________________________________________________________ @@ -501,7 +500,7 @@ AliMUONVGeometryBuilder::GetEnvelopes(Int_t chamberId) const AliMUONChamber* chamber = GetChamber(chamberId); if (!chamber) { - Fatal("GetEnvelopes", "Chamber %d is not defined", chamberId); + AliFatal(Form("Chamber %d is not defined", chamberId)); return 0; } @@ -518,7 +517,7 @@ AliMUONVGeometryBuilder::GetTransforms(Int_t chamberId) const AliMUONChamber* chamber = GetChamber(chamberId); if (!chamber) { - Fatal("GetTransforms", "Chamber %d is not defined", chamberId); + AliFatal(Form("Chamber %d is not defined", chamberId)); return 0; } @@ -535,7 +534,7 @@ AliMUONVGeometryBuilder::GetSVMap(Int_t chamberId) const AliMUONChamber* chamber = GetChamber(chamberId); if (!chamber) { - Fatal("GetSVMap", "Chamber %d is not defined", chamberId); + AliFatal(Form("Chamber %d is not defined", chamberId)); return 0; } @@ -649,7 +648,7 @@ Bool_t AliMUONVGeometryBuilder::ReadTransformations() const ifstream in(filePath, ios::in); if (!in) { cerr << filePath << endl; - Fatal("ReadTransformations", "File not found."); + AliFatal("File not found."); return false; } @@ -661,7 +660,7 @@ Bool_t AliMUONVGeometryBuilder::ReadTransformations() const else if (key == TString("DE")) key = ReadData2(in); else { - Fatal("ReadTransformations", "%s key not recognized", key.Data()); + AliFatal(Form("%s key not recognized", key.Data())); return false; } } @@ -685,7 +684,7 @@ Bool_t AliMUONVGeometryBuilder::ReadSVMap() const ifstream in(filePath, ios::in); if (!in) { cerr << filePath << endl; - Fatal("ReadSVMap", "File not found."); + AliFatal("File not found."); return false; } @@ -695,7 +694,7 @@ Bool_t AliMUONVGeometryBuilder::ReadSVMap() const if (key == TString("SV")) key = ReadData3(in); else { - Fatal("ReadSVMap", "%s key not recognized", key.Data()); + AliFatal(Form("%s key not recognized", key.Data())); return false; } } @@ -720,7 +719,7 @@ Bool_t AliMUONVGeometryBuilder::WriteTransformations() const ofstream out(filePath, ios::out); if (!out) { cerr << filePath << endl; - Error("WriteTransformations", "File not found."); + AliError("File not found."); return false; } #if !defined (__DECCXX) @@ -749,7 +748,7 @@ Bool_t AliMUONVGeometryBuilder::WriteSVMap(Bool_t rebuild) const ofstream out(filePath, ios::out); if (!out) { cerr << filePath << endl; - Error("WriteTransformations", "File not found."); + AliError("File not found."); return false; } #if !defined (__DECCXX) diff --git a/MUON/AliMUONproto.cxx b/MUON/AliMUONproto.cxx index ddad38e8f27..147aa3940ac 100644 --- a/MUON/AliMUONproto.cxx +++ b/MUON/AliMUONproto.cxx @@ -60,6 +60,7 @@ Both read digits from raw data or use the Monte-Carlo. //#include "chainalice2.h" #include "AliMUONSegmentationV0.h" //#include "AliMUONSegResV11.h" +#include "AliLog.h" ClassImp(AliMUONproto) @@ -67,7 +68,7 @@ ClassImp(AliMUONproto) AliMUONproto::AliMUONproto() : AliMUON() { - cout << "\n Calling AliMUONproto constructor..." << endl; + AliInfo(" Calling AliMUONproto constructor..."); // // @@ -546,7 +547,7 @@ void AliMUONproto::SetThreshold() ifstream inputFile("/home/alice/guernane/aliroot/pro/MUON/crped190.dat", ios::in); if (inputFile.fail()) { - cout << "Error opening file" << endl; + AliError("Error opening file"); exit(2); } diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx index e56042e3a02..d1da326056a 100644 --- a/MUON/AliMUONv1.cxx +++ b/MUON/AliMUONv1.cxx @@ -38,6 +38,7 @@ #include "AliMagF.h" #include "AliRun.h" #include "AliMC.h" +#include "AliLog.h" ClassImp(AliMUONv1) @@ -112,7 +113,7 @@ AliMUONv1::AliMUONv1(const AliMUONv1& right) { // copy constructor (not implemented) - Fatal("AliMUONv1", "Copy constructor not provided."); + AliFatal("Copy constructor not provided."); } //___________________________________________ @@ -135,7 +136,7 @@ AliMUONv1& AliMUONv1::operator=(const AliMUONv1& right) // check assignement to self if (this == &right) return *this; - Fatal("operator =", "Assignement operator not provided."); + AliFatal("Assignement operator not provided."); return *this; } @@ -168,8 +169,7 @@ void AliMUONv1::Init() // // Initialize Tracking Chambers // - - if(fDebug) printf("\n%s: Start Init for version 1 - CPC chamber type\n\n",ClassName()); + AliDebug(1,"Start Init for version 1 - CPC chamber type"); Int_t i; for (i=0; iInit(); @@ -179,14 +179,14 @@ void AliMUONv1::Init() // Initialize geometry // fGeometryBuilder->InitGeometry(); - if(fDebug) printf("\n%s: Finished Init for version 1 - CPC chamber type\n",ClassName()); + AliDebug(1,"Finished Init for version 1 - CPC chamber type"); //cp - if(fDebug) printf("\n%s: Start Init for Trigger Circuits\n",ClassName()); + AliDebug(1,"Start Init for Trigger Circuits"); for (i=0; iInit(i); } - if(fDebug) printf("%s: Finished Init for Trigger Circuits\n",ClassName()); + AliDebug(1,"Finished Init for Trigger Circuits"); //cp // @@ -395,7 +395,7 @@ void AliMUONv1::StepManager() cerr << " global position: " << x << ", " << y << ", " << z << endl; - Warning("StepManager", "DetElemId not identified."); + AliWarning("DetElemId not identified."); } // One hit per chamber diff --git a/MUON/AliMUONv3.cxx b/MUON/AliMUONv3.cxx index 748c2da1044..032d81552d0 100644 --- a/MUON/AliMUONv3.cxx +++ b/MUON/AliMUONv3.cxx @@ -43,6 +43,7 @@ #include "AliMagF.h" #include "AliRun.h" #include "AliMC.h" +#include "AliLog.h" ClassImp(AliMUONv3) @@ -114,7 +115,7 @@ AliMUONv3::AliMUONv3(const AliMUONv3& right) { // copy constructor (not implemented) - Fatal("AliMUONv3", "Copy constructor not provided."); + AliFatal("Copy constructor not provided."); } //_____________________________________________________________________________ @@ -125,7 +126,7 @@ AliMUONv3& AliMUONv3::operator=(const AliMUONv3& right) // check assignement to self if (this == &right) return *this; - Fatal("operator =", "Assignement operator not provided."); + AliFatal("Assignement operator not provided."); return *this; } @@ -1623,7 +1624,7 @@ void AliMUONv3::Init() // Initialize Tracking Chambers // - if(fDebug) printf("\n%s: Start Init for version 1 - CPC chamber type\n\n",ClassName()); + AliDebug(0,"Start Init for version 1 - CPC chamber type"); Int_t i; for (i=0; iInit(); @@ -1651,14 +1652,13 @@ void AliMUONv3::Init() ((AliMUONChamber*)(*fChambers)[12])->GetGeometry()->SetSensitiveVolume("SG3A"); ((AliMUONChamber*)(*fChambers)[13])->GetGeometry()->SetSensitiveVolume("SG4A"); - if(fDebug) printf("\n%s: Finished Init for version 1 - CPC chamber type\n",ClassName()); - + AliDebug(0,"Finished Init for version 1 - CPC chamber type"); //cp - if(fDebug) printf("\n%s: Start Init for Trigger Circuits\n",ClassName()); + AliDebug(0,"Start Init for Trigger Circuits"); for (i=0; iInit(i); } - if(fDebug) printf("%s: Finished Init for Trigger Circuits\n",ClassName()); + AliDebug(0,"Finished Init for Trigger Circuits"); //cp } -- 2.43.0