From f77f13c8bebfead91aba562a0eb4f4dfb8d83796 Mon Sep 17 00:00:00 2001 From: alibrary Date: Fri, 17 Jun 2005 09:43:01 +0000 Subject: [PATCH] Removing warnings for gcc 4.0 and using AliLog --- ITS/AliITS.cxx | 15 ++- ITS/AliITSClusterFinderSDD.cxx | 182 ++----------------------------- ITS/AliITSClusterFinderSPD.cxx | 30 ++--- ITS/AliITSClusterFinderSSD.cxx | 24 ++-- ITS/AliITSNeuralTrack.cxx | 19 +++- ITS/AliITSgeom.cxx | 25 ++--- ITS/AliITSpidESD.h | 1 + ITS/AliITSrecoV2.h | 2 +- ITS/AliITSsimulationSDD.cxx | 52 ++++----- ITS/AliITSsimulationSPD.cxx | 24 ++-- ITS/AliITSsimulationSPDdubna.cxx | 56 +++++----- ITS/AliITSv11GeometrySPD.cxx | 2 +- ITS/AliITSv11GeometrySupport.cxx | 82 +++++++------- ITS/AliITSvPPRasymmFMD.cxx | 87 +++++---------- TPC/AliComplexCluster.h | 2 + TPC/AliTPCDigitizer.cxx | 6 +- TPC/AliTPCLoader.cxx | 19 +++- TPC/AliTPCclusterMI.h | 1 + TPC/AliTPCpidESD.h | 1 + TPC/AliTPCv2.cxx | 21 ++-- 20 files changed, 237 insertions(+), 414 deletions(-) diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx index e821a454bbe..6289a0a6fb8 100644 --- a/ITS/AliITS.cxx +++ b/ITS/AliITS.cxx @@ -89,15 +89,17 @@ the AliITS class. #include "AliITSClusterFinderV2SDD.h" #include "AliITSClusterFinderV2SPD.h" #include "AliITSClusterFinderV2SSD.h" +#include "AliITSDDLRawData.h" #include "AliITSDetType.h" +#include "AliITSDigitizer.h" #include "AliITSLoader.h" -#include "AliITSRawClusterSPD.h" #include "AliITSRawClusterSDD.h" +#include "AliITSRawClusterSPD.h" #include "AliITSRawClusterSSD.h" #include "AliITSRecPoint.h" #include "AliITSclusterV2.h" -#include "AliITSdigitSPD.h" #include "AliITSdigitSDD.h" +#include "AliITSdigitSPD.h" #include "AliITSdigitSSD.h" #include "AliITSgeom.h" #include "AliITShit.h" @@ -112,12 +114,10 @@ the AliITS class. #include "AliITSsimulationSDD.h" #include "AliITSsimulationSPD.h" #include "AliITSsimulationSSD.h" +#include "AliLog.h" #include "AliMC.h" -#include "AliITSDigitizer.h" -#include "AliITSDDLRawData.h" -#include "AliRun.h" #include "AliRawReader.h" -#include "AliLog.h" +#include "AliRun.h" ClassImp(AliITS) @@ -1654,8 +1654,7 @@ void AliITS::HitsToFastRecPoints(Int_t evNumber,Int_t bgrev,Int_t size, //m.b. : this change is nothing but a nice way to make sure //the CPU goes up ! - AliDebugClassStream(1) <<"HitsToFastRecPoints: N mod = "<< - geom->GetIndexMax()<GetIndexMax())); for(module=0;moduleGetIndexMax();module++){ id = geom->GetModuleType(module); if (!all && !det[id]) continue; diff --git a/ITS/AliITSClusterFinderSDD.cxx b/ITS/AliITSClusterFinderSDD.cxx index 7256e198f62..3140baf2490 100644 --- a/ITS/AliITSClusterFinderSDD.cxx +++ b/ITS/AliITSClusterFinderSDD.cxx @@ -14,169 +14,6 @@ **************************************************************************/ /* $Id$ - $Log$ - Revision 1.38 2005/02/15 13:39:35 masera - V2 clusterer moved to the standard framework. V2 clusters and recpoints are still different objects for the moment - - Revision 1.37 2004/06/10 21:00:24 nilsen - Modifications associated with remerging the Ba/Sa and Dubna pixel simulations, - some cleaning of general code (including coding convensions), and adding some - protections associated with SetDefaults/SetDefaultSimulations which should help - with the Test beam simulations. Details below. The default SPD simulation for - the general ITS runs/geometry is still the Ba/Sa, but for the Test beam - geometries this has been changed to the merged versions. - File: AliITS.cxx Modified - File: AliITS.h Modified - In lined many one-two line functions. Added some protection to - SetDefaults(), SetDefaultSimulation(), and SetDefaultClusterFinders(), - such that they should now even work when only one detector type has - been defined (as it should be for the test beams...). Some mostly - cosmetic issues associated with getting branch names for digits. And - Generally some cleaning up of the code. - File: AliITSClusterFinder.cxx Modified - File: AliITSClusterFinder.h Modified - Did some additional consolidation of data into the base class, added - TClonesArray *fClusters, a fDebug, and fModule variables. Otherwise - some cosmetic and coding conversion changes. - File: AliITSClusterFinderSDD.cxx Modified - File: AliITSClusterFinderSDD.h Modified - Changes to be consistent with the modified base class, and cosmetic - and coding conversion changes. - File: AliITSClusterFinderSPD.cxx Modified - File: AliITSClusterFinderSPD.h Modified - Changes to be consistent with the modified base class, and cosmetic - and coding conversion changes. - File: AliITSClusterFinderSPDdubna.h Removed - File: AliITSClusterFinderSPDdubna.cxx Removed - Since we have ClusterFinderSPD and V2 and this version isn't being - maintained, it is being retired. - File: AliITSClusterFinderSSD.cxx Modified - File: AliITSClusterFinderSSD.h Modified - Changes to be consistent with the modified base class, and cosmetic - and coding conversion changes. - File: AliITSDetType.cxx Modified - File: AliITSDetType.h Modified - Added a new class variable to indicate what the detector type is - AliITSDetector fDetType; values of kSPD, kSDD, kSSD, .... Otherwise - cosmetic and Coding convention changes. - File: AliITSLoader.cxx Modified - File: AliITSLoader.h Modified - Some changes which are not complete. The idea is to be able to get, - simply via one call, a specific hit, Sdigit, digit, RecPoint,... - without all of the usual over head of initializing TClonesArrays setting - branch addresses and the like. Work is far form ready. - File: AliITSdcsSSD.cxx Modified - Some nearly cosmetic changes necessary due to changes to response and - segmentation class'. - File: AliITSgeom.h Modified - In the definition of AliITSDetector type, added kND=-1, no detector - defined. Expect to use it later(?). - File: AliITSresponse.h Modified - Basically cosmetic. Mostly changing Float_t to Double_t. - File: AliITSresponseSDD.cxx Modified - File: AliITSresponseSDD.h Modified - Basically the cosmetic and Float_t to Double_t - File: AliITSresponseSPD.cxx Modified - File: AliITSresponseSPD.h Modified - Mostly Float_t to Double_t and added in the IsPixelDead function for - the dubna version (otherwise the merging had been done). - File: AliITSresponseSPDdubna.h Removed - File: AliITSresponseSPDdubna.cxx Removed - We should be able to remove this class now. AliITSresponseSPD is now - used for both the Bari-Salerno and the dubna models. - File: AliITSresponseSSD.cxx Modified - File: AliITSresponseSSD.h Modified - Float_t to Double_t changes. - File: AliITSsegmentation.h Modified - Made LocaltoDet return a Bool_t. Now if the x,z location is outside - of the volume, it returns kFALSE. see below. - File: AliITSsegmentationSDD.cxx Modified - File: AliITSsegmentationSDD.h Modified - Made LocaltoDet return a Bool_t. Now if the x,z location is outside - of the volume, it returns kFALSE. - File: AliITSsegmentationSPD.cxx Modified - File: AliITSsegmentationSPD.h Modified - Made LocaltoDet return a Bool_t. Now if the x,z location is outside - of the volume, it returns kFALSE. - File: AliITSsegmentationSSD.cxx Modified - File: AliITSsegmentationSSD.h Modified - Made LocaltoDet return a Bool_t. Now if the x,z location is outside - of the volume, it returns kFALSE. see below. - File: AliITSsimulation.cxx Modified - File: AliITSsimulation.h Modified - Added fDebug variable, new Constructor for use below. Cosmetic and - coding convention changes - File: AliITSsimulationSDD.cxx Modified - File: AliITSsimulationSDD.h Modified - Added new Constructor, removed redundant variables and Cosmetic and - coding convention changes. - File: AliITSsimulationSPD.cxx Modified - File: AliITSsimulationSPD.h Modified - Removed some dead code, made changes as needed by the changes above - (response and segmentation classes...). a few cosmetic and coding - convention changes. - File: AliITSsimulationSPDdubna.cxx Modified - File: AliITSsimulationSPDdubna.h Modified - New merged version, implemented new and old coupling with switch, - coding convention and similar changes. (found 1 bugs, missing - ! in front of if(mod-LineSegmentL(....,). - File: AliITSsimulationSSD.cxx Modified - File: AliITSsimulationSSD.h Modified - removed redundant variables with base class. Fixed for coding - convention and other cosmetic changes. - File: AliITSvSDD03.cxx Modified - File: AliITSvSPD02.cxx Modified - File: AliITSvSSD03.cxx Modified - These two have their private versions of SetDefaults and - SetDefaultSimulation which have been similarly protected as in AliITS.cxx - File: ITSLinkDef.h Modified - File: libITS.pkg Modified - Versions which include v11 geometry and other private changes - - Revision 1.36 2004/01/27 16:12:03 masera - Coding conventions for AliITSdigitXXX classes and AliITSTrackerV1 - - Revision 1.35 2003/11/10 16:33:50 masera - Changes to obey our coding conventions - - Revision 1.34 2003/09/11 13:48:52 masera - Data members of AliITSdigit classes defined as protected (They were public) - - Revision 1.33 2003/07/21 14:20:51 masera - Fix to track labes in SDD Rec-points - - Revision 1.31.2.1 2003/07/16 13:18:04 masera - Proper fix to track labels associated to SDD rec-points - - Revision 1.31 2003/05/19 14:44:41 masera - Fix to track labels associated to SDD rec-points - - Revision 1.30 2003/03/03 16:34:35 masera - Corrections to comply with coding conventions - - Revision 1.29 2002/10/25 18:54:22 barbera - Various improvements and updates from B.S.Nilsen and T. Virgili - - Revision 1.28 2002/10/22 14:45:29 alibrary - Introducing Riostream.h - - Revision 1.27 2002/10/14 14:57:00 hristov - Merging the VirtualMC branch to the main development branch (HEAD) - - Revision 1.23.4.2 2002/10/14 13:14:07 hristov - Updating VirtualMC to v3-09-02 - - Revision 1.26 2002/09/09 17:23:28 nilsen - Minor changes in support of changes to AliITSdigitS?D class'. - - Revision 1.25 2002/05/10 22:29:40 nilsen - Change my Massimo Masera in the default constructor to bring things into - compliance. - - Revision 1.24 2002/04/24 22:02:31 nilsen - New SDigits and Digits routines, and related changes, (including new - noise values). - */ /////////////////////////////////////////////////////////////////////////// // Cluster finder // @@ -188,14 +25,15 @@ #include #include +#include "AliITS.h" #include "AliITSClusterFinderSDD.h" #include "AliITSMapA1.h" -#include "AliITS.h" -#include "AliITSdigitSDD.h" #include "AliITSRawClusterSDD.h" #include "AliITSRecPoint.h" -#include "AliITSsegmentationSDD.h" +#include "AliITSdigitSDD.h" #include "AliITSresponseSDD.h" +#include "AliITSsegmentationSDD.h" +#include "AliLog.h" #include "AliRun.h" ClassImp(AliITSClusterFinderSDD) @@ -298,7 +136,7 @@ void AliITSClusterFinderSDD::Find1DClusters(){ } // anodes for(k=0;kAddCluster( 1, &clust ); - if(GetDebug(5)) clust.PrintInfo(); + if(AliDebugLevel()>=5) clust.PrintInfo(); nClu++; } // end if nTsteps on = kFALSE; @@ -498,7 +336,7 @@ void AliITSClusterFinderSDD::Find1DClustersE(){ } // samples } // anodes } // wings - if(GetDebug(3)) cout << "# Rawclusters " << nClu << endl; + AliDebug(3,Form("# Rawclusters %d",nClu)); return; } //_______________________________________________________________________ @@ -983,7 +821,7 @@ void AliITSClusterFinderSDD::ResolveClusters(){ if( peakpos < 0 ) { //Warning("ResolveClusters", // "Digit not found for cluster"); - //if(GetDebug(3)) clusterI.PrintInfo(); + //if(AliDebugLevel()>=3) clusterI.PrintInfo(); continue; } clusterI.SetPeakPos( peakpos ); @@ -1038,10 +876,10 @@ void AliITSClusterFinderSDD::GroupClusters(){ if(clusterI->T() < fTimeStep*10) fDAnode = 1.5; // TB 1. Bool_t pair = clusterI->Brother(clusterJ,fDAnode,fDTime); if(!pair) continue; - if(GetDebug(4)){ + if(AliDebugLevel()>=4){ clusterI->PrintInfo(); clusterJ->PrintInfo(); - } // end if GetDebug + } // end if AliDebugLevel clusterI->Add(clusterJ); label[j] = 1; Clusters()->RemoveAt(j); diff --git a/ITS/AliITSClusterFinderSPD.cxx b/ITS/AliITSClusterFinderSPD.cxx index 40d22e99ae5..33e580fa870 100644 --- a/ITS/AliITSClusterFinderSPD.cxx +++ b/ITS/AliITSClusterFinderSPD.cxx @@ -17,13 +17,15 @@ // for Silicon pixels // // // //////////////////////////////////////////////////////////////////////////// -#include "AliITSClusterFinderSPD.h" + #include "AliITS.h" -#include "AliITSdigitSPD.h" +#include "AliITSClusterFinderSPD.h" #include "AliITSRawClusterSPD.h" #include "AliITSRecPoint.h" +#include "AliITSdigitSPD.h" #include "AliITSresponseSPD.h" #include "AliITSsegmentationSPD.h" +#include "AliLog.h" #include "AliRun.h" //#define DEBUG @@ -109,10 +111,8 @@ void AliITSClusterFinderSPD::FindRawClusters(Int_t module){ AliITSdigitSPD *dig; Int_t ndig=0,i; /* - if(GetDebug(4)){ - cout << "SPD - FindRawclusters"<GetTrack(0); digtr2[digitcount] = -3; digtr3[digitcount] = -3; - if(GetDebug(5)){ - cout << "digtr1["<GetTrack(0))); i=1; while(digtr1[digitcount]==dig->GetTrack(i) && iGetNTracks()) i++; - if(GetDebug(5)) cout << " fTracks["<GetTrack(i); + AliDebug(5,Form(" fTracks[%d]=%d",i,dig->GetTrack(i))); if(iGetNTracks()){ digtr2[digitcount] = dig->GetTrack(i); - if(GetDebug(5)) cout<<"digtr2["<GetTrack(i) || digtr2[digitcount]==dig->GetTrack(i))&& i<=dig->GetNTracks()) i++; if(iGetNTracks()) digtr3[digitcount] = dig->GetTrack(i); - if(GetDebug(5)){ - cout << " fTracks["<GetNTracks()) cout <GetTrack(i); - cout << "digtr3["<GetNTracks()?dig->GetTrack(i):-1,digitcount,digtr3[digitcount])); } // end if - if(GetDebug(4)) cout<GetSignal(); digitcount++; } // end for ndig diff --git a/ITS/AliITSClusterFinderSSD.cxx b/ITS/AliITSClusterFinderSSD.cxx index 70a33a47b5c..28c81397226 100644 --- a/ITS/AliITSClusterFinderSSD.cxx +++ b/ITS/AliITSClusterFinderSSD.cxx @@ -18,20 +18,23 @@ // * period of March - June 2001 // // **************************************************************************// /////////////////////////////////////////////////////////////////////////////// + #include #include -#include "AliRun.h" + #include "AliITS.h" -#include "AliITSdigitSSD.h" +#include "AliITSClusterFinderSSD.h" +#include "AliITSMapA1.h" #include "AliITSRawClusterSSD.h" #include "AliITSRecPoint.h" -#include "AliITSMapA1.h" -#include "AliITSClusterFinderSSD.h" #include "AliITSclusterSSD.h" +#include "AliITSdigitSSD.h" +#include "AliITSgeom.h" #include "AliITSpackageSSD.h" #include "AliITSresponseSSD.h" #include "AliITSsegmentationSSD.h" -#include "AliITSgeom.h" +#include "AliLog.h" +#include "AliRun.h" const Bool_t AliITSClusterFinderSSD::fgkSIDEP=kTRUE; const Bool_t AliITSClusterFinderSSD::fgkSIDEN=kFALSE; @@ -177,7 +180,7 @@ void AliITSClusterFinderSSD::InitReconstruction(){ Float_t stereoP,stereoN; GetSeg()->Angles(stereoP,stereoN); CalcStepFactor(stereoP,stereoN); - if(GetDebug(1)) cout<<"fSFF = "< -//#include -//#include -//#include -//#include -#include #include +#include #include "AliITSgeom.h" -#include "AliITSgeomSPD.h" #include "AliITSgeomSDD.h" +#include "AliITSgeomSPD.h" #include "AliITSgeomSSD.h" +#include "AliLog.h" ClassImp(AliITSgeom) @@ -265,18 +262,18 @@ void AliITSgeom::ReadNewFile(const char *filename){ char *filtmp=0; filtmp = gSystem->ExpandPathName(filename); - cout << "AliITSgeom, Reading New .det file " << filtmp << endl; + AliInfo(Form("Reading New .det file %s",filtmp)); fp = new ifstream(filtmp,ios::in); // open file to write while(fp->get(c)!=NULL){ // for ever loop if(c==' ') continue; // remove blanks if(c=='\n') continue; - if(c=='#' || c=='!'){for(;fp->get(c)!=NULL,c!='\n';); continue;} + if(c=='#' || c=='!') {while(fp->get(c)) if(c=='\n') break; continue;} if(c=='/'){ fp->get(c);{ - if(c=='/'){for(;fp->get(c)!=NULL,c!='\n';);continue;} + if(c=='/') {while(fp->get(c)) if(c=='\n') break; continue;} if(c=='*'){ NotYet: - for(;fp->get(c)!=NULL,c!='*';); + while(fp->get(c)) if(c=='*') break; fp->get(c);{ if(c=='/') continue; goto NotYet; @@ -346,8 +343,8 @@ void AliITSgeom::ReadNewFile(const char *filename){ ssd = 0; break; default: - Error("ReadNewFile","Unknown fShape type number=%d c=%c",ldet,c); - for(;fp->get(c)==NULL,c!='\n';); // skip to end of line. + AliError(Form("Unknown fShape type number=%d c=%c",ldet,c)); + while(fp->get(c)) if(c=='\n') break; // skip to end of line. break; } // end switch break; @@ -361,8 +358,8 @@ void AliITSgeom::ReadNewFile(const char *filename){ m = 0; break; default: - Error("ReadNewFile","Data line i=%d c=%c",i,c); - for(;fp->get(c)==NULL,c!='\n';); // skip this line + AliError(Form("ReadNewFile","Data line i=%d c=%c",i,c)); + while(fp->get(c)) if(c=='\n') break; // skip this line break; } // end switch i } // end while diff --git a/ITS/AliITSpidESD.h b/ITS/AliITSpidESD.h index 92bfc40a6b8..31bc2928e4c 100644 --- a/ITS/AliITSpidESD.h +++ b/ITS/AliITSpidESD.h @@ -15,6 +15,7 @@ class AliESD; class AliITSpidESD { public: AliITSpidESD(Double_t *param); + virtual ~AliITSpidESD() {} Int_t MakePID(AliESD *event); static Double_t Bethe(Double_t bg); private: diff --git a/ITS/AliITSrecoV2.h b/ITS/AliITSrecoV2.h index 87d7ba04bf0..3ea6260dd16 100644 --- a/ITS/AliITSrecoV2.h +++ b/ITS/AliITSrecoV2.h @@ -17,7 +17,7 @@ const Int_t kMaxClusterPerLayer20=7000*10*2/20; const Int_t kMaxDetectorPerLayer=1000; - const Int_t kLayersNotToSkip[]={0,0,0,0,0,0}; + const Int_t kLayersNotToSkip[6]={0,0,0,0,0,0}; const Int_t kLastLayerToTrackTo=0; const Int_t kMaxLayer = 6; diff --git a/ITS/AliITSsimulationSDD.cxx b/ITS/AliITSsimulationSDD.cxx index bdb9306e289..6772542a36a 100644 --- a/ITS/AliITSsimulationSDD.cxx +++ b/ITS/AliITSsimulationSDD.cxx @@ -32,24 +32,25 @@ #include #include -#include "AliRun.h" #include "AliITS.h" -#include "AliITShit.h" -#include "AliITSdigitSDD.h" -#include "AliITSdigitSPD.h" -#include "AliITSmodule.h" -#include "AliITSpList.h" +#include "AliITSHuffman.h" #include "AliITSMapA1.h" #include "AliITSMapA2.h" -#include "AliITSetfSDD.h" #include "AliITSRawData.h" -#include "AliITSHuffman.h" +#include "AliITSdigitSDD.h" +#include "AliITSdigitSPD.h" +#include "AliITSetfSDD.h" #include "AliITSgeom.h" -#include "AliITSsegmentation.h" +#include "AliITShit.h" +#include "AliITSmodule.h" +#include "AliITSpList.h" #include "AliITSresponse.h" -#include "AliITSsegmentationSDD.h" #include "AliITSresponseSDD.h" +#include "AliITSsegmentation.h" +#include "AliITSsegmentationSDD.h" #include "AliITSsimulationSDD.h" +#include "AliLog.h" +#include "AliRun.h" ClassImp(AliITSsimulationSDD) //////////////////////////////////////////////////////////////////////// @@ -553,12 +554,9 @@ void AliITSsimulationSDD::HitsToAnalogDigits( AliITSmodule *mod ) { // continue if the particle did not lose energy // passing through detector if (!depEnergy) { - if(GetDebug()){ - Warning("HitsToAnalogDigits", - "fTrack = %d hit=%d module=%d This particle has" - " passed without losing energy!", - itrack,ii,mod->GetIndex()); - } + AliDebug(1, + Form("fTrack = %d hit=%d module=%d This particle has passed without losing energy!", + itrack,ii,mod->GetIndex())); continue; } // end if !depEnergy @@ -569,12 +567,9 @@ void AliITSsimulationSDD::HitsToAnalogDigits( AliITSmodule *mod ) { if(drPath < 0) drPath = -drPath; drPath = sddLength-drPath; if(drPath < 0) { - if(GetDebug()){ // this should be fixed at geometry level - Warning("HitsToAnalogDigits", - "negative drift path drPath=%e sddLength=%e dxL[0]=%e " - "xL[0]=%e", - drPath,sddLength,dxL[0],xL[0]); - } + AliDebug(1, // this should be fixed at geometry level + Form("negative drift path drPath=%e sddLength=%e dxL[0]=%e xL[0]=%e", + drPath,sddLength,dxL[0],xL[0])); continue; } // end if drPath < 0 @@ -602,12 +597,9 @@ void AliITSsimulationSDD::HitsToAnalogDigits( AliITSmodule *mod ) { driftPath = sddLength-driftPath; detector = 2*(hitDetector-1) + iWing; if(driftPath < 0) { - if(GetDebug()){ // this should be fixed at geometry level - Warning("HitsToAnalogDigits","negative drift path " - "driftPath=%e sddLength=%e avDrft=%e dxL[0]=%e " - "xL[0]=%e",driftPath,sddLength,avDrft,dxL[0], - xL[0]); - } + AliDebug(1, // this should be fixed at geometry level + Form("negative drift path driftPath=%e sddLength=%e avDrft=%e dxL[0]=%e xL[0]=%e", + driftPath,sddLength,avDrft,dxL[0],xL[0])); continue; } // end if driftPath < 0 @@ -805,7 +797,7 @@ void AliITSsimulationSDD::ListOfFiredCells(Int_t *arg,Double_t timeAmplitude, trlist->Add(&trinfo); } // end if lasttrack==idtrack - if(GetDebug()){ + if(AliDebugLevel()){ // check the track list - debugging Int_t trk[20], htrk[20]; Float_t chtrk[20]; @@ -821,7 +813,7 @@ void AliITSsimulationSDD::ListOfFiredCells(Int_t *arg,Double_t timeAmplitude, cout << "nptracks "<AddSimDigit(0,phys,digits,tracks,hits,charges); - if(GetDebug()){ - cout << " CreateSPDDigit mod=" << fModule << " r,c=" << r; - cout <<","<GetSignalOnly(r,c),fpList->GetNoise(r,c), + signal,GetThreshold())); } // end if of threshold condition } // for c }// end do on pixels @@ -942,11 +937,10 @@ void AliITSsimulationSPD::WriteSDigits(AliITSpList *pList){ for(i=0;iGetSignalOnly(i,j)>0.0){ aliITS->AddSumDigit(*(pList->GetpListItem(i,j))); - if(GetDebug()){ + if(AliDebugLevel()){ cout << "pListSPD: " << *(pList->GetpListItem(i,j)) << endl; - cout << " CreateSPDSDigit mod=" << fModule << " r,c="; - cout << i <<","<< j << " sig=" << fpList->GetSignalOnly(i,j); - cout << " noise=" << fpList->GetNoise(i,j) <GetSignalOnly(i,j),fpList->GetNoise(i,j))) } // end if GetDebug } // end if } // end for i,j diff --git a/ITS/AliITSsimulationSPDdubna.cxx b/ITS/AliITSsimulationSPDdubna.cxx index 86e4d7d0b00..b41629a548c 100644 --- a/ITS/AliITSsimulationSPDdubna.cxx +++ b/ITS/AliITSsimulationSPDdubna.cxx @@ -17,22 +17,23 @@ $Id$ */ #include -#include #include #include -#include #include +#include +#include -#include "AliRun.h" #include "AliITS.h" -#include "AliITShit.h" +#include "AliITSMapA2.h" #include "AliITSdigitSPD.h" +#include "AliITShit.h" #include "AliITSmodule.h" -#include "AliITSMapA2.h" #include "AliITSpList.h" -#include "AliITSsimulationSPDdubna.h" -#include "AliITSsegmentationSPD.h" #include "AliITSresponseSPD.h" +#include "AliITSsegmentationSPD.h" +#include "AliITSsimulationSPDdubna.h" +#include "AliLog.h" +#include "AliRun.h" //#define DEBUG @@ -59,8 +60,7 @@ fCoupling(0){ // Return: // A default constructed AliITSsimulationSPDdubna class. - if(GetDebug(1)) Info("AliITSsimulationSPDdubda()", - "Calling degault constructor"); + AliDebug(1,Form("Calling degault constructor")); } //______________________________________________________________________ AliITSsimulationSPDdubna::AliITSsimulationSPDdubna(AliITSsegmentation *seg, @@ -85,9 +85,8 @@ fCoupling(cup){ // Return: // A default constructed AliITSsimulationSPDdubna class. - if(GetDebug(1)) Info("AliITSsimulationSPDdubda", - "Calling degault constructor seg=%p resp=%p cup=%d", - seg,resp,cup); + AliDebug(1, + Form("Calling degault constructor seg=%p resp=%p cup=%d",seg,resp,cup)); if(cup==1||cup==2){ // For the moment, remove defusion if Coupling is // set. resp->SetTemperature(0.0); @@ -187,8 +186,7 @@ void AliITSsimulationSPDdubna::InitSimulationModule(Int_t module, Int_t event){ // Returns: // none - if(GetDebug(1)) Info("InitSimulationModule","(module=%d,event=%d)", - module,event); + AliDebug(1,Form("(module=%d,event=%d)",module,event)); SetModuleNumber(module); SetEventNumber(event); ClearMap(); @@ -208,11 +206,10 @@ void AliITSsimulationSPDdubna::SDigitiseModule(AliITSmodule *mod,Int_t, // test // test returns kTRUE if the module contained hits // // test returns kFALSE if it did not contain hits - if(GetDebug(1)) Info("SDigitiseModule","(mod=%p, ,event=%d)",mod,event); + AliDebug(1,Form("(mod=%p, ,event=%d)",mod,event)); if(!(mod->GetNhits())){ - if(GetDebug(1)) Info("SDigitiseModule","In event %d module %d there " - "are %d hits returning.",event, - mod->GetIndex(),mod->GetNhits()); + AliDebug(1,Form("In event %d module %d there are %d hits returning.", + event, mod->GetIndex(),mod->GetNhits())); return;// if module has no hits don't create Sdigits } // end if SetModuleNumber(mod->GetIndex()); @@ -233,15 +230,14 @@ void AliITSsimulationSPDdubna::WriteSDigits(){ Int_t ix, nix, iz, niz; static AliITS *aliITS = (AliITS*)gAlice->GetModule("ITS"); - if(GetDebug(1))Info("WriteSDigits","Writing SDigits for module %d", - GetModuleNumber()); + AliDebug(1,Form("Writing SDigits for module %d",GetModuleNumber())); GetMap()->GetMaxMapIndex(niz, nix); for(iz=0; izGetSignalOnly(iz,ix)>0.0){ aliITS->AddSumDigit(*(GetMap()->GetpListItem(iz,ix))); - if(GetDebug(1)){ - cout <<"AliITSsimulationSPDdubna:WriteSDigits " << iz << "," - << ix << "," << *(GetMap()->GetpListItem(iz,ix)) << endl; + if(AliDebugLevel()>0) { + AliDebug(1,Form("%d, %d",iz,ix)); + cout << *(GetMap()->GetpListItem(iz,ix)) << endl; } // end if GetDebug } // end if GetMap()->GetSignalOnly(iz,ix)>0.0 } // end for iz,ix @@ -257,7 +253,7 @@ void AliITSsimulationSPDdubna::FinishSDigitiseModule(){ // Return // none - if(GetDebug(1)) Info("SDigitiseModule","()"); + AliDebug(1,"()"); pListToDigits(); // Charge To Signal both adds noise and ClearMap(); return; @@ -277,7 +273,7 @@ void AliITSsimulationSPDdubna::DigitiseModule(AliITSmodule *mod,Int_t, // Return: // none. - if(GetDebug(1)) Info("DigitiseModule","(mod=%p,,)",mod); + AliDebug(1,Form("(mod=%p,,)",mod)); HitToSDigit(mod); pListToDigits(); ClearMap(); @@ -300,13 +296,13 @@ void AliITSsimulationSPDdubna::HitToSDigit(AliITSmodule *mod){ Double_t x,y,z,t,tp,st,dt=0.2,el,sig; Double_t thick = kmictocm*GetSeg()->Dy(); - if(GetDebug(1)) Info("HitsToSDigits","(mod=%p) fCoupling=%d", - mod,fCoupling); + AliDebug(1,Form("(mod=%p) fCoupling=%d",mod,fCoupling)); if(nhits<=0) return; for(h=0;hGetHit(h)) << endl; - } // end if GetDebug + if(AliDebugLevel()>0) { + AliDebug(1,Form("Hits, %d", h)); + cout << *(mod->GetHit(h)) << endl; + } // end if GetDebug if(!mod->LineSegmentL(h,x0,x1,y0,y1,z0,z1,de,idtrack)) continue; st = TMath::Sqrt(x1*x1+y1*y1+z1*z1); if(st>0.0){ diff --git a/ITS/AliITSv11GeometrySPD.cxx b/ITS/AliITSv11GeometrySPD.cxx index b9b6d669199..ceb8404cba2 100644 --- a/ITS/AliITSv11GeometrySPD.cxx +++ b/ITS/AliITSv11GeometrySPD.cxx @@ -246,7 +246,7 @@ void AliITSv11GeometrySPD::CarbonFiberSector(TGeoVolume *moth){ secY[ksecNRadii-1] = TanD(90.+0.5*ksecAngleSide13)* (secX[ksecNRadii-1]-secX[0]) + secY[0]; // - if(GetDebug(2)){ + if(AliDebugLevel()>=2){ cout <<" X \t Y \t R \t S \t E"<SetVertex(0,xo[0],yo[0]); sA1->SetVertex(1,xo[1],yo[1]); @@ -516,7 +516,7 @@ void AliITSv11GeometrySupport::SPDThermalSheald(TGeoVolume *moth){ "ITSspdShealdWingVV:ITSspdShealdVVt2)+" "ITSspdShealdWingVV:ITSspdShealdVVt3"); // - if(GetDebug()){ + if(AliDebugLevel()){ tranITSspdShealdVVt0->Print(); rotITSspdShealdVVt1->Print(); rotITSspdShealdVVt2->Print(); @@ -546,7 +546,7 @@ void AliITSv11GeometrySupport::SPDThermalSheald(TGeoVolume *moth){ sM1->InspectShape(); sM2->InspectShape(); sM->InspectShape(); - } // end if GetDebug + } // end if AliDebugLevel // TGeoManager *mgr = gGeoManager; medSPDcf = mgr->GetMedium("ITSspdCarbonFiber"); @@ -730,7 +730,7 @@ void AliITSv11GeometrySupport::SPDThermalSheald(TGeoVolume *moth){ vM->AddNode(vB3,7,new TGeoCombiTrans(*tranb,*rot)); vM->AddNode(vB3,8,new TGeoCombiTrans(*tranbm,*rot)); vM->AddNode(vC3,4,new TGeoCombiTrans(*tranc,*rot)); - if(GetDebug()){ + if(AliDebugLevel()){ vA1->PrintNodes(); vAh1->PrintNodes(); vA2->PrintNodes(); @@ -795,12 +795,12 @@ void AliITSv11GeometrySupport::SDDCone(TGeoVolume *moth){ ktsOuterR-ktscarbonFiberth,0.5*ktsLength); sD = new TGeoTube("ITS SDD CC M6 bolt end",0.0,0.5*ktsBoltDiameter, 0.5*ktsBoltDepth); - if(GetDebug()){ + if(AliDebugLevel()){ sA->InspectShape(); sB->InspectShape(); sC->InspectShape(); sD->InspectShape(); - } // end if GetDebug + } // end if AliDebugLevel // TGeoManager *mgr = gGeoManager; medSDDcf = mgr->GetMedium("ITSssdCarbonFiber"); @@ -847,7 +847,7 @@ void AliITSv11GeometrySupport::SDDCone(TGeoVolume *moth){ tran = new TGeoTranslation("",x,y,-z); vC->AddNode(vD,i+n+1,tran); } // end for i - if(GetDebug()){ + if(AliDebugLevel()){ vA->PrintNodes(); vB->PrintNodes(); vC->PrintNodes(); @@ -1071,37 +1071,37 @@ void AliITSv11GeometrySupport::SDDCone(TGeoVolume *moth){ // rot = new TGeoRotation("ITSsddRotZ30",0.0,0.0,30.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); rot = new TGeoRotation("ITSsddRotZ60",0.0,0.0,60.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); rot = new TGeoRotation("ITSsddRotZ90",0.0,0.0,90.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); rot = new TGeoRotation("ITSsddRotZ120",0.0,0.0,120.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); rot = new TGeoRotation("ITSsddRotZ150",0.0,0.0,150.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); rot = new TGeoRotation("ITSsddRotZ180",0.0,0.0,180.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); rot = new TGeoRotation("ITSsddRotZ210",0.0,0.0,210.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); rot = new TGeoRotation("ITSsddRotZ240",0.0,0.0,240.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); rot = new TGeoRotation("ITSsddRotZ270",0.0,0.0,270.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); rot = new TGeoRotation("ITSsddRotZ300",0.0,0.0,300.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); rot = new TGeoRotation("ITSsddRotZ330",0.0,0.0,330.0); rot->RegisterYourself(); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); sL = new TGeoCompositeShape("ITS SDD Suport Cone","(((((((((((((((((" "ITSsddSuportConeCarbonFiberSurfaceE -" "ITSsddSuportConeHoleH) -" @@ -1165,7 +1165,7 @@ void AliITSv11GeometrySupport::SDDCone(TGeoVolume *moth){ "ITSsddSuportConeHoleK:ITSsddRotZ240) -" "ITSsddSuportConeHoleK:ITSsddRotZ300"); //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - if(GetDebug()){ + if(AliDebugLevel()){ sE->InspectShape(); sF->InspectShape(); sG->InspectShape(); @@ -1176,7 +1176,7 @@ void AliITSv11GeometrySupport::SDDCone(TGeoVolume *moth){ sL->InspectShape(); sM->InspectShape(); sN->InspectShape(); - } // end if GetDebug() + } // end if AliDebugLevel() // TGeoVolume *vL,*vM,*vN; vL = new TGeoVolume("ITSsddConeL",sL,medSDDcf); @@ -1205,7 +1205,7 @@ void AliITSv11GeometrySupport::SDDCone(TGeoVolume *moth){ rot = new TGeoRotation("",0.0,180.0*fgkDegree,0.0); rotran = new TGeoCombiTrans("",0.0,0.0,kconZ0,rot); moth->AddNode(vL,2,rotran); - if(GetDebug()){ + if(AliDebugLevel()){ tran->Print(); rot->Print(); rotran->Print(); @@ -1322,7 +1322,7 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth){ sCE = new TGeoTube("ITS SSD Thermal Centeral Cylinder PinCE", 0.0,kcylRPin,0.5*kcylZPin); // - if(GetDebug()){ + if(AliDebugLevel()){ sCA->InspectShape(); sCB->InspectShape(); sCC->InspectShape(); @@ -1364,7 +1364,7 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth){ vCB->AddNode(vCC,1,0); vCA->AddNode(vCB,1,0); moth->AddNode(vCA,1,0); - if(GetDebug()){ + if(AliDebugLevel()){ vCA->PrintNodes(); vCB->PrintNodes(); vCC->PrintNodes(); @@ -1817,7 +1817,7 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth){ TGeoCombiTrans *rotranBrTZ300 = new TGeoCombiTrans("ITSssdConeBrTZ300", vg[0],vg[1],vg[2],rotZ300); rotranBrTZ300->RegisterYourself(); - if(GetDebug()){ + if(AliDebugLevel()){ rotZ225->Print(); rotZ675->Print(); rotZ90->Print(); @@ -1848,7 +1848,7 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth){ rotranBrTZ60->Print(); rotranBrTZ180->Print(); rotranBrTZ300->Print(); - } // end if GetDebug() + } // end if AliDebugLevel() sA = new TGeoCompositeShape("ITSssdSuportConeCarbonFiberSurfaceA", "((((((((((((((((((((((((((((" "ITSssdSuportConeCarbonFiberSurfaceA0 +" @@ -1969,7 +1969,7 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth){ sS = new TGeoTube("ITS Air in front of Stainless Steal Screw end, M6S", sQ->GetRmin(3),sQ->GetRmax(3),0.5*kconCthick); // - if(GetDebug()){ + if(AliDebugLevel()){ sA0->InspectShape(); sB0->InspectShape(); sC0->InspectShape(); @@ -1994,7 +1994,7 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth){ sB->InspectShape(); sC->InspectShape(); sF->InspectShape(); - } // end if GetDebug() + } // end if AliDebugLevel() TGeoVolume *vA,*vB,*vC,*vD,*vE,*vF,*vQ,*vR,*vS,*vT; // vA = new TGeoVolume("ITSssdConeA",sA,medSSDcf); // Carbon Fiber @@ -2184,7 +2184,7 @@ void AliITSv11GeometrySupport::SSDCone(TGeoVolume *moth){ vB->AddNode(vE,++nCopyvE,tran); } // end for j } // end for i - if(GetDebug()){ + if(AliDebugLevel()){ vA->PrintNodes(); vB->PrintNodes(); vC->PrintNodes(); @@ -2289,11 +2289,11 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth){ sM24->Z(2) = zA24[kfrm24NZsections] + kfrm24Width; sM24->Rmin(2) = sA24[kfrm24NZsections]->GetRmin(); sM24->Rmax(2) = sA24[kfrm24NZsections]->GetRmax(); - if(GetDebug()){ + if(AliDebugLevel()){ sM24->InspectShape(); for(i=0;iInspectShape(); for(i=0;iInspectShape(); - } // end if GetDebug() + } // end if AliDebugLevel() TGeoVolume *vA24[kfrm24NZsections+1],*vB24[kfrm24NZsections],*vM24; TGeoTranslation *tran; TGeoRotation *rot,*rot1; @@ -2353,7 +2353,7 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth){ delete rot;// rot not explicity used in AddNode functions. moth->AddNode(vM24,i+1,tranrot); } // end for i - if(GetDebug()){ + if(AliDebugLevel()){ for(i=0;iPrintNodes(); for(i=0;iPrintNodes(); vM24->PrintNodes(); @@ -2666,7 +2666,7 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth){ sMT24->Rmax(4) = TMath::Hypot(sT24->GetX(3)+sT24->GetXOffset(2), sT24->GetY(3)+sT24->GetYOffset(2)); // - if(GetDebug()){ + if(AliDebugLevel()){ sT24->InspectShape(); sW24->InspectShape(); sTl24->InspectShape(); @@ -2680,7 +2680,7 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth){ sV3PP24->InspectShape(); sV2PP24->InspectShape(); sMT24->InspectShape(); - } // end if GetDebug() + } // end if AliDebugLevel() // TGeoVolume *vC24[kct24Ntrays],*vT24[kct24Ntrays],*vPP24[kft24NPatchPannels]; TGeoVolume *vWTV024,*vW24,*vU24,*vUFMD24,*vVl24,*vVlFMD24,*vVs24,*vMT24; @@ -2766,7 +2766,7 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth){ tha[i+ kct24Ntrays/2] = 180.0 + tha[i]; tha[i+3*kct24Ntrays/4] = 270.0 + tha[i]; } // end for i - if(GetDebug()) for(i=0;iSetFillColor(vT24[i]->GetLineColor()); vT24[i]->SetFillStyle(4000); // 0% transparent rot = new TGeoRotation("",0.0,0.0,tha[i]-90.0); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); vMT24->AddNode(vT24[i],1,rot); // if(strncmp(trayName[i],"FMD",3)==0){ @@ -2872,12 +2872,12 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth){ vPP24[i]->SetFillColor(vPP24[i]->GetLineColor()); vPP24[i]->SetFillStyle(4000); // 0% transparent rot = new TGeoRotation("",0.0,0.0,thb[i]-90.0); - if(GetDebug()) rot->Print(); + if(AliDebugLevel()) rot->Print(); vMT24->AddNode(vPP24[i],1,rot); } // end for i tran = new TGeoTranslation("",0.0,0.0,kfrm24Z0); moth->AddNode(vMT24,1,tran); - if(GetDebug()){ + if(AliDebugLevel()){ for(i=0;iPrintNodes(); for(i=0;iPrintNodes(); vU24->PrintNodes(); @@ -2935,11 +2935,11 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth){ sB26->SetVertex(5,sA26[1]->GetRmax1()-r,-0.5*kfrm26Width); sB26->SetVertex(6,sA26[1]->GetRmin1()-r,-0.5*kfrm26Width); sB26->SetVertex(7,sA26[1]->GetRmin1()-r,+0.5*kfrm26Width); - if(GetDebug()){ + if(AliDebugLevel()){ for(i=0;iInspectShape(); sM26->InspectShape(); sB26->InspectShape(); - } // end if GetDebug() + } // end if AliDebugLevel() // TGeoVolume *vA26[kfrm26NZsections+1],*vB26,*vM26; // @@ -2994,7 +2994,7 @@ void AliITSv11GeometrySupport::ServicesCableSupport(TGeoVolume *moth){ delete rot; // rot not explicity used in AddNode functions. moth->AddNode(vM26,i+1,tranrot); } // end for i - if(GetDebug()){ + if(AliDebugLevel()){ for(i=0;iPrintNodes(); vB26->PrintNodes(); vM26->PrintNodes(); diff --git a/ITS/AliITSvPPRasymmFMD.cxx b/ITS/AliITSvPPRasymmFMD.cxx index 81a34c781c1..d32d6a74e81 100644 --- a/ITS/AliITSvPPRasymmFMD.cxx +++ b/ITS/AliITSvPPRasymmFMD.cxx @@ -30,30 +30,14 @@ // See AliITSvPPRasymmFMD::StepManager(). #include -// #include -// #include - -// #include -// #include #include -// #include // only required for Tracking function? #include #include #include #include -// #include -// #include -// #include -// #include #include -// #include -// #include -// #include "AliConst.h" #include "AliITS.h" -// #include "AliITSClusterFinderSDD.h" -// #include "AliITSClusterFinderSPD.h" -// #include "AliITSClusterFinderSSD.h" #include "AliITSDetType.h" #include "AliITSGeant3Geometry.h" #include "AliITSgeom.h" @@ -67,14 +51,12 @@ #include "AliITSsegmentationSDD.h" #include "AliITSsegmentationSPD.h" #include "AliITSsegmentationSSD.h" -// #include "AliITSsimulationSDD.h" -// #include "AliITSsimulationSPD.h" -// #include "AliITSsimulationSSD.h" #include "AliITSvPPRasymmFMD.h" +#include "AliLog.h" +#include "AliMC.h" #include "AliMagF.h" #include "AliRun.h" #include "AliTrackReference.h" -#include "AliMC.h" #define GEANTGEOMETRY kTRUE @@ -326,31 +308,31 @@ void AliITSvPPRasymmFMD::CreateGeometry(){ dchip2 = GetThicknessChip2(); if(ddet1 < 100. || ddet1 > 300.) { - cout << "ITS - WARNING: the detector thickness for layer 1 is outside " - "the range of [100,300] microns. The default value of 200 microns " - "will be used." << endl; + AliWarning("The detector thickness for layer 1 is outside "); + AliWarning("the range of [100,300] microns. The default value of 200 microns "); + AliWarning("will be used."); ddet1=200.; } // end if if(ddet2 < 100. || ddet2 > 300.) { - cout << "ITS - WARNING: the detector thickness for layer 2 is outside " - "the range of [100,300] microns. The default value of 200 microns " - "will be used." << endl; + AliWarning("The detector thickness for layer 2 is outside "); + AliWarning("the range of [100,300] microns. The default value of 200 microns "); + AliWarning("will be used."); ddet2=200.; }// end if if(dchip1 < 100. || dchip1 > 300.) { - cout << "ITS - WARNING: the chip thickness for layer 1 is outside " - "the range of [100,300] microns. The default value of 200 microns " - "will be used." << endl; - dchip1=200.; + AliWarning("The chip thickness for layer 1 is outside"); + AliWarning("the range of [100,300] microns. The default value of 200 microns"); + AliWarning("will be used."); + dchip1=200.; }// end if if(dchip2 < 100. || dchip2 > 300.) { - cout << "ITS - WARNING: the chip thickness for layer 2 is outside " - "the range of [100,300] microns. The default value of 200 microns" - " will be used." << endl; - dchip2=200.; + AliWarning("The chip thickness for layer 2 is outside"); + AliWarning("the range of [100,300] microns. The default value of 200 microns"); + AliWarning("will be used"); + dchip2=200.; }// end if Int_t rails = 1; // flag for rails (1 --> rails in; 0 --> rails out) @@ -363,24 +345,21 @@ void AliITSvPPRasymmFMD::CreateGeometry(){ fluid = GetCoolingFluid(); if(rails != 0 && rails != 1) { - cout << "ITS - WARNING: the switch for rails is not set neither " - "to 0 (rails out) nor to 1 (rails in). The default value of " - "1 (rails in) will be used." << endl; + AliWarning("The switch for rails is not set neither"); + AliWarning("to 0 (rails out) nor to 1 (rails in). The default value of"); + AliWarning("1 (rails in) will be used"); + rails=1; }// end if - cout << "ITS: Detector thickness on layer 1 is set to " << - ddet1 << " microns." << endl; - cout << "ITS: Chip thickness on layer 1 is set to " << - dchip1 << " microns." << endl; - cout << "ITS: Detector thickness on layer 2 is set to " << - ddet2 << " microns." << endl; - cout << "ITS: Chip thickness on layer 2 is set to " << - dchip2 << " microns." << endl; + AliInfo(Form("Detector thickness on layer 1 is set to %f microns",ddet1)); + AliInfo(Form("Chip thickness on layer 1 is set to %f microns",dchip1)); + AliInfo(Form("Detector thickness on layer 2 is set to %f microns",ddet2)); + AliInfo(Form("Chip thickness on layer 2 is set to %f microns",dchip2)); if(rails == 0 ) { - cout << "ITS: Rails are out." << endl; + AliInfo("Rails are out."); } else { - cout << "ITS: Rails are in." << endl; + AliInfo("Rails are in."); }// end if ddet1 = ddet1*0.0001/2.; // conversion from tot length in um to half in cm @@ -5018,7 +4997,7 @@ void AliITSvPPRasymmFMD::InitAliITSgeom(){ "Wrong Monte Carlo. InitAliITSgeom uses TGeant3 calls"); return; } // end if - cout << "Reading Geometry transformation directly from Geant 3." << endl; + AliDebug(1,"Reading Geometry transformation directly from Geant 3."); const Int_t knlayers = 6; const Int_t kndeep = 9; Int_t itsGeomTreeNames[knlayers][kndeep],lnam[20],lnum[20]; @@ -5070,7 +5049,7 @@ void AliITSvPPRasymmFMD::InitAliITSgeom(){ // Sorry, but this is not very pritty code. It should be replaced // at some point with a version that can search through the geometry // tree its self. - cout << "Reading Geometry informaton from Geant3 common blocks" << endl; + AliDebug(1,"Reading Geometry informaton from Geant3 common blocks"); for(i=0;i<20;i++) lnam[i] = lnum[i] = 0; for(i=0;iWriteNewFile(fWrite); AliITS::Init(); // - for(i=0;i<72;i++) cout << "*"; - cout << endl; fIDMother = gMC->VolId("ITSV"); // ITS Mother Volume ID. } //______________________________________________________________________ @@ -5189,7 +5162,7 @@ void AliITSvPPRasymmFMD::SetDefaults(){ // none. const Float_t kconv = 1.0e+04; // convert cm to microns - cout << "AliITSvPPRasymmFMD::SetDefaults" << endl; + AliInfo("Called"); AliITSDetType *iDetType; AliITSgeomSPD *s0; diff --git a/TPC/AliComplexCluster.h b/TPC/AliComplexCluster.h index 3eff8f5cc4b..63d4ad10437 100644 --- a/TPC/AliComplexCluster.h +++ b/TPC/AliComplexCluster.h @@ -63,6 +63,7 @@ class AliTPCTrackerPoint { public: AliTPCTrackerPoint(){fTX=0; fTY=0; fTZ=0; fTAngleZ=0; fTAngleY=0; fIsShared = 0;} + virtual ~AliTPCTrackerPoint(){} Float_t GetX() const {return (fTX*0.01);} Float_t GetZ() const {return (fTZ*0.01);} Float_t GetY() const {return (fTY*0.01);} @@ -102,6 +103,7 @@ class AliTPCTrackerPoint { class AliTPCClusterPoint { public: AliTPCClusterPoint(){fCZ=fCY=fSigmaZ=fSigmaY=fQ=fMax=fCType=0;} + virtual ~AliTPCClusterPoint(){} Float_t GetZ() const {return (fCZ*0.01);} Float_t GetY() const {return (fCY*0.01);} Float_t GetSigmaZ() const {return (fSigmaZ*0.02);} diff --git a/TPC/AliTPCDigitizer.cxx b/TPC/AliTPCDigitizer.cxx index 33609b45139..cfad412b4b6 100644 --- a/TPC/AliTPCDigitizer.cxx +++ b/TPC/AliTPCDigitizer.cxx @@ -31,7 +31,7 @@ #include "AliPDG.h" #include "AliRunDigitizer.h" #include "AliSimDigits.h" - +#include "AliLog.h" ClassImp(AliTPCDigitizer) @@ -48,9 +48,7 @@ AliTPCDigitizer::AliTPCDigitizer(AliRunDigitizer* manager) { // ctor which should be used fDebug =0; - if (GetDebug()>2) - cerr<<"AliTPCDigitizer::AliTPCDigitizer" - <<"(AliRunDigitizer* manager) was processed"< #include -#include #include +#include #include "AliConst.h" +#include "AliLog.h" +#include "AliMC.h" #include "AliRun.h" #include "AliTPCDigitsArray.h" #include "AliTPCParam.h" #include "AliTPCParamSR.h" #include "AliTPCTrackHitsV2.h" #include "AliTPCv2.h" -#include "AliMC.h" ClassImp(AliTPCv2) @@ -115,18 +116,18 @@ void AliTPCv2::CreateGeometry() for (i = 0; i < 6; ++i) { if (fSecLows[i] >= 0 && fSecLows[i] < 2*nInnerSector) { ifl1 = 1; - printf("%s: *** SECTOR %d selected\n",ClassName(),fSecLows[i]); + AliInfo(Form("*** SECTOR %d selected",fSecLows[i])); } } } else { - printf("%s: *** ALL LOWER SECTORS SELECTED ***\n",ClassName()); + AliInfo("*** ALL LOWER SECTORS SELECTED ***"); ifl1 = 1; } if (ifl1 == 0) { - printf("%s: *** ERROR: AT LEAST ONE LOWER SECTOR MUST BE SPECIFIED ***\n",ClassName()); - printf("%s: !!! PROGRAM STOPPED !!!\n",ClassName()); + AliError("*** AT LEAST ONE LOWER SECTOR MUST BE SPECIFIED ***"); + AliError("!!! PROGRAM STOPPED !!!"); exit(1); } @@ -135,12 +136,12 @@ void AliTPCv2::CreateGeometry() for (i = 0; i < 12; ++i) { if (fSecUps[i] > 2*nInnerSector-1 && fSecUps[i] < 2*(nInnerSector+nOuterSector)) { - printf("%s: *** SECTOR %d selected\n",ClassName(),fSecUps[i]); + AliInfo(Form("*** SECTOR %d selected",fSecUps[i])); } } } else { - printf("%s: *** ALL UPPER SECTORS SELECTED ***\n",ClassName()); + AliInfo("*** ALL UPPER SECTORS SELECTED ***"); } @@ -1811,8 +1812,8 @@ void AliTPCv2::Init() gMC->Gstpar(idtmed[2],"LOSS",5); // specific energy loss - printf("%s: *** TPC version 2 initialized ***\n",ClassName()); - printf("%s: Maximum number of steps = %d\n",ClassName(),gMC->GetMaxNStep()); + AliInfo("*** TPC version 2 initialized ***"); + AliInfo(Form("Maximum number of steps = %d",gMC->GetMaxNStep())); // -- 2.43.0