From bff3a2440c4c182235ff78b93feb41977b6d2917 Mon Sep 17 00:00:00 2001 From: alibrary Date: Fri, 17 Jun 2005 09:43:58 +0000 Subject: [PATCH] Corrections for gcc 4.0 --- PMD/AliPMDLoader.cxx | 20 +++++++++++++++++++- PMD/AliPMDv1.cxx | 38 +++++++++++++------------------------- RAW/binalimdc.pkg | 2 +- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/PMD/AliPMDLoader.cxx b/PMD/AliPMDLoader.cxx index c31a1061233..819afa1325b 100644 --- a/PMD/AliPMDLoader.cxx +++ b/PMD/AliPMDLoader.cxx @@ -1,3 +1,20 @@ +/************************************************************************** + * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * * + * Author: The ALICE Off-line Project. * + * Contributors are mentioned in the code where appropriate. * + * * + * Permission to use, copy, modify and distribute this software and its * + * documentation strictly for non-commercial purposes is hereby granted * + * without fee, provided that the above copyright notice appears in all * + * copies and that both the copyright notice and this permission notice * + * 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$ */ + #include "AliPMDLoader.h" #include "AliLog.h" @@ -16,7 +33,8 @@ AliPMDLoader::AliPMDLoader() AliPMDLoader::AliPMDLoader(const Char_t *name,const Char_t *topfoldername) :AliLoader(name,topfoldername) { - AliInfoClass(Form(" name = %s; topfolder = %s",name,topfoldername)); + AliDebug(1,Form("Name = %s; topfolder = %s",name,topfoldername)); + } /*****************************************************************************/ diff --git a/PMD/AliPMDv1.cxx b/PMD/AliPMDv1.cxx index 619f6b9a72d..26b03816356 100644 --- a/PMD/AliPMDv1.cxx +++ b/PMD/AliPMDv1.cxx @@ -28,14 +28,15 @@ /////////////////////////////////////////////////////////////////////////////// //// -#include "AliPMDv1.h" -#include "AliRun.h" -#include "AliConst.h" -#include "AliMagF.h" #include "Riostream.h" #include -#include "AliMC.h" + +#include "AliConst.h" #include "AliLog.h" +#include "AliMC.h" +#include "AliMagF.h" +#include "AliPMDv1.h" +#include "AliRun.h" const Int_t AliPMDv1::fgkNcolUM1 = 48; // Number of cols in UM, type 1 const Int_t AliPMDv1::fgkNcolUM2 = 96; // Number of cols in UM, type 2 @@ -653,7 +654,7 @@ void AliPMDv1::DrawModule() const //gMC->Gdman(17, 5, "MAN"); gMC->Gdopt("hide", "off"); - cout << " Outside Draw Modules " << endl; + AliDebug(1,"Outside Draw Modules"); } //_____________________________________________________________________________ @@ -780,7 +781,7 @@ void AliPMDv1::CreateMaterials() gMC->Gstpar(idtmed[604], "CUTHAD", 1e-5); gMC->Gstpar(idtmed[604], "CUTMUO", 1e-5); - cout << " Outside create materials " << endl; + AliDebug(1,"Outside create materials"); } @@ -791,25 +792,12 @@ void AliPMDv1::Init() // Initialises PMD detector after it has been built // - Int_t i; - // gAliKdet=1; // - cout << " Inside Init " << endl; - if(AliLog::GetGlobalDebugLevel()>0) { - printf("\n%s: ",ClassName()); - for(i=0;i<35;i++) printf("*"); - printf(" PMD_INIT "); - for(i=0;i<35;i++) printf("*"); - printf("\n%s: ",ClassName()); - printf(" PMD simulation package (v1) initialised\n"); - printf("%s: parameters of pmd\n",ClassName()); - printf("%s: %10.2f %10.2f %10.2f \ - %10.2f\n",ClassName(),fgkCellRadius,fgkCellWall,fgkCellDepth,fgkZdist ); - printf("%s: ",ClassName()); - for(i=0;i<80;i++) printf("*"); - printf("\n"); - } - + AliDebug(2,"Inside Init"); + AliDebug(2,"PMD simulation package (v1) initialised"); + AliDebug(2,"parameters of pmd"); + AliDebug(2,Form("%10.2f %10.2f %10.2f %10.2f\n", + fgkCellRadius,fgkCellWall,fgkCellDepth,fgkZdist)); Int_t *idtmed = fIdtmed->GetArray()-599; fMedSens=idtmed[605-1]; diff --git a/RAW/binalimdc.pkg b/RAW/binalimdc.pkg index 4fd78a53782..833bbb78c09 100644 --- a/RAW/binalimdc.pkg +++ b/RAW/binalimdc.pkg @@ -1,5 +1,5 @@ #-*- Mode: Makefile -*- - +# $Id$ include HLT/hlt.conf EDEFINE := ${HLTDEFS} -- 2.43.0