From: schutz Date: Tue, 5 Nov 2002 11:23:37 +0000 (+0000) Subject: change the formattin in Print() X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=11f9c5ffb14c571666639e9c11ac07d6d505a130 change the formattin in Print() --- diff --git a/EMCAL/AliEMCALClusterizerv1.cxx b/EMCAL/AliEMCALClusterizerv1.cxx index 827bebf1a64..9c6bad43087 100644 --- a/EMCAL/AliEMCALClusterizerv1.cxx +++ b/EMCAL/AliEMCALClusterizerv1.cxx @@ -721,10 +721,12 @@ void AliEMCALClusterizerv1::PrintRecPoints(Option_t * option) fRecPointsInRun += towerRecPoints->GetEntriesFast() ; fRecPointsInRun += preshoRecPoints->GetEntriesFast() ; + char * tempo = new char[8192]; + if(strstr(option,"all")) { message += "Tower clusters\n" ; - message += "Index Ene(MeV) Multi Module phi r theta Lambda 1 Lambda 2 # of prim Primaries list\n" ; + message += "Index Ene(MeV) Multi Module phi r theta Lambda 1 Lambda 2 # of prim Primaries list\n" ; Int_t index ; for (index = 0 ; index < towerRecPoints->GetEntries() ; index++) { @@ -736,30 +738,14 @@ void AliEMCALClusterizerv1::PrintRecPoints(Option_t * option) Int_t * primaries; Int_t nprimaries; primaries = rp->GetPrimaries(nprimaries); - - message += rp->GetIndexInList() ; - message += " " ; - message += rp->GetEnergy() ; - message += " " ; - message += rp->GetMultiplicity() ; - message += " " ; - message += rp->GetEMCALArm() ; - message += " " ; - message += globalpos.X() ; - message += " " ; - message += globalpos.Y() ; - message += globalpos.Z() ; - message += " " ; - message += lambda[0] ; - message += " " ; - message += lambda[1] ; - message += " " ; - message += nprimaries ; - message += " : " ; + sprintf(tempo, "\n%6d %8.2f %3d %2d %4.1f %4.1f %4.1f %4f %4f %2d : ", + rp->GetIndexInList(), rp->GetEnergy(), rp->GetMultiplicity(), rp->GetEMCALArm(), + globalpos.X(), globalpos.Y(), globalpos.Z(), lambda[0], lambda[1], nprimaries) ; + message += tempo ; for (Int_t iprimary=0; iprimaryGetEntries() ; index++) { AliEMCALTowerRecPoint * rp = dynamic_cast(preshoRecPoints->At(index)) ; @@ -779,37 +765,20 @@ void AliEMCALClusterizerv1::PrintRecPoints(Option_t * option) Int_t * primaries; Int_t nprimaries; primaries = rp->GetPrimaries(nprimaries); - - message += rp->GetIndexInList() ; - message += " " ; - message += rp->GetEnergy() ; - message += " " ; - message += rp->GetMultiplicity() ; - message += " " ; - message += rp->GetEMCALArm() ; - message += " " ; - message += globalpos.X() ; - message += " " ; - message += globalpos.Y() ; - message += " " ; - message += globalpos.Z() ; - message += " " ; - message += lambda[0] ; - message += " " ; - message += lambda[1] ; - message += " " ; - message += nprimaries ; - message += " : " ; - + sprintf(tempo, "\n%6d %8.2f %3d %2d %4.1f %4.1f %4.1f %4f %4f %2d : ", + rp->GetIndexInList(), rp->GetEnergy(), rp->GetMultiplicity(), rp->GetEMCALArm(), + globalpos.X(), globalpos.Y(), globalpos.Z(), lambda[0], lambda[1], nprimaries) ; + message += tempo ; + for (Int_t iprimary=0; iprimaryGetEntriesFast() ; + if(strstr(option,"all")){ //loop over digits AliEMCALDigit * digit; - message += "\nDigit Id Amplitude Index Nprim Primaries list " ; + message += "\n Id Amplitude Time Index Nprim: Primaries list \n" ; Int_t index ; + char * tempo = new char[8192]; for (index = 0 ; index < fDigits->GetEntries() ; index++) { digit = (AliEMCALDigit * ) fDigits->At(index) ; - message += digit->GetId() ; - message += " " ; - message += digit->GetAmp() ; - message += " " ; - message += digit->GetIndexInList() ; - message += " " ; - message += digit->GetNprimary() ; - message += " : " ; - + sprintf(tempo, "\n%6d %8d %6.5e %4d %2d : ", + digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ; + message += tempo ; Int_t iprimary; for (iprimary=0; iprimaryGetNprimary(); iprimary++) { - message += digit->GetPrimary(iprimary+1) ; - message += " "; + sprintf(tempo, "%d ",digit->GetPrimary(iprimary+1) ) ; + message += tempo ; } } + delete tempo ; } Info("PrintDigits", message.Data() ) ; } diff --git a/EMCAL/AliEMCALGetter.cxx b/EMCAL/AliEMCALGetter.cxx index 62289be9192..3f1272f338d 100644 --- a/EMCAL/AliEMCALGetter.cxx +++ b/EMCAL/AliEMCALGetter.cxx @@ -287,32 +287,32 @@ const Bool_t AliEMCALGetter::BranchExists(const TString recName) const if(recName == "SDigits"){ filename=fSDigitsFileName ; name = "TreeS0" ; - dataname = "PHOS" ; - zername = "AliPHOSSDigitizer" ; + dataname = "EMCAL" ; + zername = "AliEMCALSDigitizer" ; } else if(recName == "Digits"){ filename=fDigitsFileName ; name = "TreeD0" ; - dataname = "PHOS" ; - zername = "AliPHOSDigitizer" ; + dataname = "EMCAL" ; + zername = "AliEMCALDigitizer" ; } else if(recName =="RecPoints"){ filename=fRecPointsFileName ; name = "TreeR0" ; - dataname = "PHOSEmcRP" ; - zername = "AliPHOSClusterizer" ; + dataname = "EMCALEmcRP" ; + zername = "AliEMCALClusterizer" ; } else if(recName == "TrackSegments"){ filename=fTrackSegmentsFileName ; name = "TreeR0" ; - dataname = "PHOSTS" ; - zername = "AliPHOSTrackSegmentMaker" ; + dataname = "EMCALTS" ; + zername = "AliEMCALTrackSegmentMaker" ; } else if(recName == "RecParticles"){ filename= fRecParticlesFileName ; name = "TreeR0" ; - dataname = "PHOSRP" ; - zername = "AliPHOSPID" ; + dataname = "EMCALRP" ; + zername = "AliEMCALPID" ; } else return kFALSE ; @@ -1485,7 +1485,7 @@ Int_t AliEMCALGetter::ReadTreeR(const Int_t event) // Read the reconstrunction tree gAlice->TreeR() // A particularity has been introduced here : // if gime->Event(ievent,"R") is called branches with the current title are read, the current title - // being for example give in AliPHOSPID(fileName, title) + // being for example give in AliEMCALPID(fileName, title) // if gime(Event(ievent, "RA") is called the title of the branches is not checked anymore, "A" stands for any // This is a feature needed by PID to be able to reconstruct several times particles (each time a ther title is given) // from a given set of TrackSegments (with a given name) diff --git a/EMCAL/AliEMCALSDigitizer.cxx b/EMCAL/AliEMCALSDigitizer.cxx index 4856173a08e..d8df1253cd2 100644 --- a/EMCAL/AliEMCALSDigitizer.cxx +++ b/EMCAL/AliEMCALSDigitizer.cxx @@ -430,27 +430,22 @@ void AliEMCALSDigitizer::PrintSDigits(Option_t * option){ //loop over digits AliEMCALDigit * digit; - message += "\nSDigit Id Amplitude Time Index Nprim Primaries list \n" ; + message += "\n Id Amplitude Time Index Nprim: Primaries list \n" ; Int_t index ; + char * tempo = new char[8192]; for (index = 0 ; index < sdigits->GetEntries() ; index++) { digit = dynamic_cast( sdigits->At(index) ) ; - message += digit->GetId() ; - message += " " ; - message += digit->GetAmp() ; - message += " " ; - message += digit->GetTime() ; - message += " "; - message += digit->GetIndexInList() ; - message += " " ; - message += digit->GetNprimary() ; - message += " : "; + sprintf(tempo, "\n%6d %8d %6.5e %4d %2d :", + digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ; + message += tempo ; Int_t iprimary; for (iprimary=0; iprimaryGetNprimary(); iprimary++) { - message += digit->GetPrimary(iprimary+1) ; - message += " "; + sprintf(tempo, "%d ",digit->GetPrimary(iprimary+1) ) ; + message += tempo ; } } + delete tempo ; } Info("PrintSDigits", message.Data() ) ; } diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx index da3471294d4..42311dbfee0 100644 --- a/PHOS/AliPHOSClusterizerv1.cxx +++ b/PHOS/AliPHOSClusterizerv1.cxx @@ -1026,9 +1026,11 @@ void AliPHOSClusterizerv1::PrintRecPoints(Option_t * option) fRecPointsInRun += emcRecPoints->GetEntriesFast() ; fRecPointsInRun += cpvRecPoints->GetEntriesFast() ; + char * tempo = new char[8192]; + if(strstr(option,"all")) { - message += "EMC clusters " ; - message += " Index Ene(MeV) Multi Module X Y Z Lambda 1 Lambda 2 # of prim Primaries list " ; + message += "\nEMC clusters\n" ; + message += "Index Ene(MeV) Multi Module X Y Z Lambda 1 Lambda 2 # of prim Primaries list\n" ; Int_t index ; for (index = 0 ; index < emcRecPoints->GetEntries() ; index++) { AliPHOSEmcRecPoint * rp = (AliPHOSEmcRecPoint * )emcRecPoints->At(index) ; @@ -1038,68 +1040,41 @@ void AliPHOSClusterizerv1::PrintRecPoints(Option_t * option) rp->GetElipsAxis(lambda); Int_t * primaries; Int_t nprimaries; - message += " " ; primaries = rp->GetPrimaries(nprimaries); - message += "\n" ; - message += rp->GetIndexInList() ; - message += " " ; - message += rp->GetEnergy(); - message += " " ; - message += rp->GetMultiplicity() ; - message += " " ; - message += rp->GetPHOSMod() ; - message += " " ; - message += locpos.X() ; - message += " " ; - message += locpos.Y() ; - message += " " ; - message += locpos.Z() ; - message += " " ; - message += lambda[0] ; - message += " " ; - message += lambda[1] ; - message += " " ; - message += nprimaries ; - message += " : " ; + sprintf(tempo, "\n%6d %8.2f %3d %2d %4.1f %4.1f %4.1f %4f %4f %2d : ", + rp->GetIndexInList(), rp->GetEnergy(), rp->GetMultiplicity(), rp->GetPHOSMod(), + locpos.X(), locpos.Y(), locpos.Z(), lambda[0], lambda[1], nprimaries) ; + message += tempo ; for (Int_t iprimary=0; iprimaryGetEntries() ; index++) { - AliPHOSRecPoint * rp = (AliPHOSRecPoint * )cpvRecPoints->At(index) ; - - TVector3 locpos; - rp->GetLocalPosition(locpos); - - Int_t * primaries; - Int_t nprimaries ; - primaries = rp->GetPrimaries(nprimaries); - message += "\n" ; - message += rp->GetIndexInList() ; - message += " " ; - message += rp->GetPHOSMod(); - message += " " ; - message += locpos.X() ; - message += " " ; - message += locpos.Y() ; - message += " " ; - message += locpos.Z() ; - message += " " ; - message += nprimaries ; - message += " : " ; - primaries = rp->GetPrimaries(nprimaries); - for (Int_t iprimary=0; iprimaryGetEntries() ; index++) { + AliPHOSRecPoint * rp = (AliPHOSRecPoint * )cpvRecPoints->At(index) ; + + TVector3 locpos; + rp->GetLocalPosition(locpos); + + Int_t * primaries; + Int_t nprimaries ; + primaries = rp->GetPrimaries(nprimaries); + sprintf(tempo, "\n%6d %8.2f %2d %4.1f %4.1f %4.1f %2d : ", + rp->GetIndexInList(), rp->GetEnergy(), rp->GetPHOSMod(), + locpos.X(), locpos.Y(), locpos.Z(), nprimaries) ; + message += tempo ; + primaries = rp->GetPrimaries(nprimaries); + for (Int_t iprimary=0; iprimaryGetEvNumber() ; message += "\n Number of entries in Digits list " ; message += digits->GetEntriesFast() ; - + char * tempo = new char[8192]; + if(strstr(option,"all")||strstr(option,"EMC")){ //loop over digits AliPHOSDigit * digit; message += "\nEMC digits (with primaries):\n" ; - message += "Digit Id Amplitude Index Nprim Primaries list\n" ; + message += "\n Id Amplitude Time Index Nprim: Primaries list \n" ; Int_t maxEmc = gime->PHOSGeometry()->GetNModules()*gime->PHOSGeometry()->GetNCristalsInModule() ; Int_t index ; for (index = 0 ; (index < digits->GetEntriesFast()) && @@ -694,19 +695,13 @@ void AliPHOSDigitizer::Print(Option_t* option)const digit = (AliPHOSDigit * ) digits->At(index) ; if(digit->GetNprimary() == 0) continue; - message += "\n" ; - message += digit->GetId() ; - message += " " ; - message += digit->GetAmp() ; - message += " " ; - message += digit->GetIndexInList() ; - message += " " ; - message += digit->GetNprimary() ; - message += " : " ; + sprintf(tempo, "\n%6d %8d %6.5e %4d %2d :", + digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ; + message += tempo ; Int_t iprimary; for (iprimary=0; iprimaryGetNprimary(); iprimary++) { - message += digit->GetPrimary(iprimary+1) ; - message += " " ; + sprintf(tempo, "%d ",digit->GetPrimary(iprimary+1) ) ; + message += tempo ; } } } @@ -716,31 +711,25 @@ void AliPHOSDigitizer::Print(Option_t* option)const //loop over CPV digits AliPHOSDigit * digit; message += "\nCPV digits:\n" ; - message += "Digit Id Amplitude Index Nprim Primaries list\n" ; + message += "\n Id Amplitude Index Nprim: Primaries list \n" ; Int_t maxEmc = gime->PHOSGeometry()->GetNModules()*gime->PHOSGeometry()->GetNCristalsInModule() ; Int_t index ; for (index = 0 ; index < digits->GetEntriesFast(); index++) { digit = (AliPHOSDigit * ) digits->At(index) ; if(digit->GetId() > maxEmc){ - message += "\n" ; - message += digit->GetId(); - message += " " ; - message += digit->GetAmp() ; - message += " " ; - message += digit->GetIndexInList() ; - message += " " ; - message += digit->GetNprimary() ; - message += " : " ; - + sprintf(tempo, "\n%6d %8d %4d %2d :", + digit->GetId(), digit->GetAmp(), digit->GetIndexInList(), digit->GetNprimary()) ; + message += tempo ; Int_t iprimary; for (iprimary=0; iprimaryGetNprimary(); iprimary++) { - message += digit->GetPrimary(iprimary+1) ; - message += " " ; + sprintf(tempo, "%d ",digit->GetPrimary(iprimary+1) ) ; + message += tempo ; } } } } + delete tempo ; Info("Print", message.Data() ) ; } diff --git a/PHOS/AliPHOSReconstructioner.h b/PHOS/AliPHOSReconstructioner.h index 4c745fdc60d..32e7178155c 100644 --- a/PHOS/AliPHOSReconstructioner.h +++ b/PHOS/AliPHOSReconstructioner.h @@ -59,7 +59,7 @@ public: AliPHOSReconstructioner & operator = (const AliPHOSReconstructioner & rvalue) { // assignement operator requested by coding convention but not needed - Fatal("operator =", "not implemented") ; + Fatal("operator =", "not implementeyd") ; return *this ; } diff --git a/PHOS/AliPHOSSDigitizer.cxx b/PHOS/AliPHOSSDigitizer.cxx index 89e5dab9eb4..41077cd89e1 100644 --- a/PHOS/AliPHOSSDigitizer.cxx +++ b/PHOS/AliPHOSSDigitizer.cxx @@ -341,13 +341,14 @@ void AliPHOSSDigitizer::PrintSDigits(Option_t * option) message += gAlice->GetEvNumber(); message += "\n Number of entries in SDigits list " ; message += sdigits->GetEntriesFast() ; + char * tempo = new char[8192]; if(strstr(option,"all")||strstr(option,"EMC")){ //loop over digits AliPHOSDigit * digit; message += "\nEMC sdigits\n" ; - message += "Digit Id Amplitude Index Nprim Primaries list\n" ; + message += "\n Id Amplitude Time Index Nprim: Primaries list \n" ; Int_t maxEmc = gime->PHOSGeometry()->GetNModules()*gime->PHOSGeometry()->GetNCristalsInModule() ; Int_t index ; for (index = 0 ; (index < sdigits->GetEntriesFast()) && @@ -355,13 +356,14 @@ void AliPHOSSDigitizer::PrintSDigits(Option_t * option) digit = dynamic_cast( sdigits->At(index) ) ; if(digit->GetNprimary() == 0) continue; - message += digit->GetId() ; - message += digit->GetAmp() ; - message += digit->GetIndexInList() ; - message += digit->GetNprimary() ; + sprintf(tempo, "\n%6d %8d %6.5e %4d %2d :", + digit->GetId(), digit->GetAmp(), digit->GetTime(), digit->GetIndexInList(), digit->GetNprimary()) ; + message += tempo ; Int_t iprimary; - for (iprimary=0; iprimaryGetNprimary(); iprimary++) - message += digit->GetPrimary(iprimary+1) ; + for (iprimary=0; iprimaryGetNprimary(); iprimary++) { + sprintf(tempo, "%d ",digit->GetPrimary(iprimary+1) ) ; + message += tempo ; + } } } @@ -371,29 +373,24 @@ void AliPHOSSDigitizer::PrintSDigits(Option_t * option) AliPHOSDigit * digit; message += "CPV sdigits\n" ; - message += "Digit Id Amplitude Index Nprim Primaries list\n" ; + message += "\n Id Amplitude Index Nprim: Primaries list \n" ; Int_t maxEmc = gime->PHOSGeometry()->GetNModules()*gime->PHOSGeometry()->GetNCristalsInModule() ; Int_t index ; for (index = 0 ; index < sdigits->GetEntriesFast(); index++) { digit = dynamic_cast( sdigits->At(index) ) ; if(digit->GetId() > maxEmc){ - message += "\n" ; - message += digit->GetId() ; - message += " " ; - message += digit->GetAmp() ; - message += " " ; - message += digit->GetIndexInList() ; - message += " " ; - message += digit->GetNprimary() ; - message += " " ; + sprintf(tempo, "\n%6d %8d %4d %2d :", + digit->GetId(), digit->GetAmp(), digit->GetIndexInList(), digit->GetNprimary()) ; + message += tempo ; Int_t iprimary; for (iprimary=0; iprimaryGetNprimary(); iprimary++) { - message += digit->GetPrimary(iprimary+1) ; - message += "," ; + sprintf(tempo, "%d ",digit->GetPrimary(iprimary+1) ) ; + message += tempo ; } } } } + delete tempo ; Info("PrintSDigits", message.Data() ) ; }