From dafbc1c59783ac2fbc7f1ce092b92c7c1351f84b Mon Sep 17 00:00:00 2001 From: fca Date: Tue, 8 Jun 1999 17:16:23 +0000 Subject: [PATCH] Changed DimuonCombinator into AliDimuCombinator to follow ALICE coding rules. --- ...onCombinator.cxx => AliDimuCombinator.cxx} | 62 +++++++++---------- ...DimuonCombinator.h => AliDimuCombinator.h} | 10 +-- EVGEN/EVGENLinkDef.h | 2 +- EVGEN/Make-depend | 57 ++++++++++++++++- EVGEN/Makefile | 2 +- 5 files changed, 92 insertions(+), 41 deletions(-) rename EVGEN/{DimuonCombinator.cxx => AliDimuCombinator.cxx} (74%) rename EVGEN/{DimuonCombinator.h => AliDimuCombinator.h} (93%) diff --git a/EVGEN/DimuonCombinator.cxx b/EVGEN/AliDimuCombinator.cxx similarity index 74% rename from EVGEN/DimuonCombinator.cxx rename to EVGEN/AliDimuCombinator.cxx index 707bc1b0954..a815a5e95b3 100644 --- a/EVGEN/DimuonCombinator.cxx +++ b/EVGEN/AliDimuCombinator.cxx @@ -2,15 +2,15 @@ // // // -#include "DimuonCombinator.h" +#include "AliDimuCombinator.h" #include "AliRun.h" #include "TRandom.h" // -ClassImp(DimuonCombinator) +ClassImp(AliDimuCombinator) // // Iterators // - GParticle* DimuonCombinator::FirstMuon() + GParticle* AliDimuCombinator::FirstMuon() { fimuon1=fimin1; fmuon1 = (GParticle*) fPartArray->UncheckedAt(fimuon1); @@ -22,7 +22,7 @@ ClassImp(DimuonCombinator) return fmuon1; } - GParticle* DimuonCombinator::FirstMuonSelected() + GParticle* AliDimuCombinator::FirstMuonSelected() { GParticle * muon=FirstMuon(); while(muon!=0 && !Selected(muon)) {muon=NextMuon();} @@ -30,7 +30,7 @@ ClassImp(DimuonCombinator) } - GParticle* DimuonCombinator::NextMuon() + GParticle* AliDimuCombinator::NextMuon() { fimuon1++; if (fimuon1>=fNParticle) {fmuon1 = 0; return fmuon1;} @@ -44,7 +44,7 @@ ClassImp(DimuonCombinator) return fmuon1; } -GParticle* DimuonCombinator::NextMuonSelected() +GParticle* AliDimuCombinator::NextMuonSelected() { GParticle * muon=NextMuon(); while(muon !=0 && !Selected(muon)) {muon=NextMuon();} @@ -52,7 +52,7 @@ GParticle* DimuonCombinator::NextMuonSelected() } - void DimuonCombinator::FirstPartner() + void AliDimuCombinator::FirstPartner() { if (fimin1==fimin2) { fimuon2=fimuon1+1; @@ -67,14 +67,14 @@ GParticle* DimuonCombinator::NextMuonSelected() fmuon2 = (GParticle*) fPartArray->UncheckedAt(fimuon2); } } -void DimuonCombinator::FirstPartnerSelected() +void AliDimuCombinator::FirstPartnerSelected() { FirstPartner(); while(fmuon2 !=0 && !Selected(fmuon2)) {NextPartner();} } - void DimuonCombinator::NextPartner() + void AliDimuCombinator::NextPartner() { fimuon2++; if (fimuon2>=fimax2) {fmuon2 = 0; return;} @@ -90,26 +90,26 @@ void DimuonCombinator::FirstPartnerSelected() } -void DimuonCombinator::NextPartnerSelected() +void AliDimuCombinator::NextPartnerSelected() { NextPartner(); while(fmuon2 !=0 && !Selected(fmuon2)) {NextPartner();} } - GParticle* DimuonCombinator::Partner() + GParticle* AliDimuCombinator::Partner() { return fmuon2; } -void DimuonCombinator::FirstMuonPair(GParticle* & muon1, GParticle* & muon2) +void AliDimuCombinator::FirstMuonPair(GParticle* & muon1, GParticle* & muon2) { FirstMuon(); FirstPartner(); muon1=fmuon1; muon2=fmuon2; } -void DimuonCombinator::NextMuonPair(GParticle* & muon1, GParticle* & muon2) +void AliDimuCombinator::NextMuonPair(GParticle* & muon1, GParticle* & muon2) { NextPartner(); if (!Partner()) { @@ -119,14 +119,14 @@ void DimuonCombinator::NextMuonPair(GParticle* & muon1, GParticle* & muon2) muon1=fmuon1; muon2=fmuon2; } -void DimuonCombinator::FirstMuonPairSelected(GParticle* & muon1, GParticle* & muon2) +void AliDimuCombinator::FirstMuonPairSelected(GParticle* & muon1, GParticle* & muon2) { FirstMuonSelected(); FirstPartnerSelected(); muon1=fmuon1; muon2=fmuon2; } -void DimuonCombinator::NextMuonPairSelected(GParticle* & muon1, GParticle* & muon2) +void AliDimuCombinator::NextMuonPairSelected(GParticle* & muon1, GParticle* & muon2) { NextPartnerSelected(); if (!Partner()) { @@ -136,20 +136,20 @@ void DimuonCombinator::NextMuonPairSelected(GParticle* & muon1, GParticle* & muo muon1=fmuon1; muon2=fmuon2; } -void DimuonCombinator::ResetRange() +void AliDimuCombinator::ResetRange() { fimin1=fimin2=0; fimax1=fimax2=fNParticle; } -void DimuonCombinator::SetFirstRange(Int_t from, Int_t to) +void AliDimuCombinator::SetFirstRange(Int_t from, Int_t to) { fimin1=from; fimax1=to; if (fimax1 > fNParticle) fimax1=fNParticle; } -void DimuonCombinator::SetSecondRange(Int_t from, Int_t to) +void AliDimuCombinator::SetSecondRange(Int_t from, Int_t to) { fimin2=from; fimax2=to; @@ -159,7 +159,7 @@ void DimuonCombinator::SetSecondRange(Int_t from, Int_t to) // Selection // -Bool_t DimuonCombinator::Selected(GParticle* part) +Bool_t AliDimuCombinator::Selected(GParticle* part) { // // @@ -174,14 +174,14 @@ Bool_t DimuonCombinator::Selected(GParticle* part) } -Bool_t DimuonCombinator::Selected(GParticle* part1, GParticle* part2) +Bool_t AliDimuCombinator::Selected(GParticle* part1, GParticle* part2) { return Selected(part1)*Selected(part2); } // // Kinematics // -Float_t DimuonCombinator::Mass(GParticle* part1, GParticle* part2) +Float_t AliDimuCombinator::Mass(GParticle* part1, GParticle* part2) { Float_t px,py,pz,e; px=part1->GetPx()+part2->GetPx(); @@ -196,7 +196,7 @@ Float_t DimuonCombinator::Mass(GParticle* part1, GParticle* part2) } } -Float_t DimuonCombinator::PT(GParticle* part1, GParticle* part2) +Float_t AliDimuCombinator::PT(GParticle* part1, GParticle* part2) { Float_t px,py; px=part1->GetPx()+part2->GetPx(); @@ -204,12 +204,12 @@ Float_t DimuonCombinator::PT(GParticle* part1, GParticle* part2) return TMath::Sqrt(px*px+py*py); } -Float_t DimuonCombinator::Pz(GParticle* part1, GParticle* part2) +Float_t AliDimuCombinator::Pz(GParticle* part1, GParticle* part2) { return part1->GetPz()+part2->GetPz(); } -Float_t DimuonCombinator::Y(GParticle* part1, GParticle* part2) +Float_t AliDimuCombinator::Y(GParticle* part1, GParticle* part2) { Float_t pz,e; pz=part1->GetPz()+part2->GetPz(); @@ -218,14 +218,14 @@ Float_t DimuonCombinator::Y(GParticle* part1, GParticle* part2) } // Response // -void DimuonCombinator::SmearGauss(Float_t width, Float_t & value) +void AliDimuCombinator::SmearGauss(Float_t width, Float_t & value) { value+=gRandom->Gaus(0, width); } // Weighting // -Float_t DimuonCombinator::Decay_Prob(GParticle* part) +Float_t AliDimuCombinator::Decay_Prob(GParticle* part) { Float_t d, h, theta, CTau; GParticle* parent = Parent(part); @@ -259,7 +259,7 @@ Float_t DimuonCombinator::Decay_Prob(GParticle* part) } } -Float_t DimuonCombinator::Weight(GParticle* part1, GParticle* part2) +Float_t AliDimuCombinator::Weight(GParticle* part1, GParticle* part2) { Float_t wgt=(part1->GetWgt())*(part2->GetWgt()); @@ -271,11 +271,11 @@ Float_t DimuonCombinator::Weight(GParticle* part1, GParticle* part2) } -Float_t DimuonCombinator::Weight(GParticle* part) +Float_t AliDimuCombinator::Weight(GParticle* part) { return (part->GetWgt())*(Parent(part)->GetWgt())*fRate1; } -Bool_t DimuonCombinator::Correlated(GParticle* part1, GParticle* part2) +Bool_t AliDimuCombinator::Correlated(GParticle* part1, GParticle* part2) { if (Origin(part1) == Origin(part2)) { return kTRUE; @@ -283,12 +283,12 @@ Bool_t DimuonCombinator::Correlated(GParticle* part1, GParticle* part2) return kFALSE; } } -GParticle* DimuonCombinator::Parent(GParticle* part) +GParticle* AliDimuCombinator::Parent(GParticle* part) { return (GParticle*) (fPartArray->UncheckedAt(part->GetParent())); } -Int_t DimuonCombinator::Origin(GParticle* part) +Int_t AliDimuCombinator::Origin(GParticle* part) { Int_t iparent= part->GetParent(); if (iparent < 0) return iparent; diff --git a/EVGEN/DimuonCombinator.h b/EVGEN/AliDimuCombinator.h similarity index 93% rename from EVGEN/DimuonCombinator.h rename to EVGEN/AliDimuCombinator.h index 569353fdf51..79dde5279bf 100644 --- a/EVGEN/DimuonCombinator.h +++ b/EVGEN/AliDimuCombinator.h @@ -1,5 +1,5 @@ -#ifndef _DimuonCombinator_H -#define _DimuonCombinator_H +#ifndef _AliDimuCombinator_H +#define _AliDimuCombinator_H #include "GParticle.h" #include #include @@ -7,11 +7,11 @@ #include -class DimuonCombinator: +class AliDimuCombinator: public TObject { public: - DimuonCombinator(TClonesArray* Partarray){ + AliDimuCombinator(TClonesArray* Partarray){ fPartArray=Partarray; fNParticle=fPartArray->GetEntriesFast(); @@ -92,7 +92,7 @@ private: Float_t fPtMin; Float_t fEtaMin; Float_t fEtaMax; - ClassDef(DimuonCombinator,1) + ClassDef(AliDimuCombinator,1) // Dimuon Combinator }; #endif diff --git a/EVGEN/EVGENLinkDef.h b/EVGEN/EVGENLinkDef.h index 15220e1ec96..b560fa0872a 100644 --- a/EVGEN/EVGENLinkDef.h +++ b/EVGEN/EVGENLinkDef.h @@ -22,7 +22,7 @@ #pragma link C++ class AliGenMUONlib; #pragma link C++ class AliGenFLUKAsource; #pragma link C++ class AliGenHalo; -#pragma link C++ class DimuonCombinator; +#pragma link C++ class AliDimuCombinator; #endif diff --git a/EVGEN/Make-depend b/EVGEN/Make-depend index 933d1a833ef..6bebf41a2ed 100644 --- a/EVGEN/Make-depend +++ b/EVGEN/Make-depend @@ -56,7 +56,7 @@ AliGenFLUKAsource.o: /hdb2/offline/pro/include/AliGenerator.h AliGenFLUKAsource.o: /soft/root/include/TNamed.h /soft/root/include/TArrayF.h AliGenFLUKAsource.o: /soft/root/include/TGenerator.h /soft/root/include/TF1.h AliGenFLUKAsource.o: /soft/root/include/TTree.h AliGenMUONlib.h -AliGenFLUKAsource.o: /soft/root/include/TROOT.h +AliGenFLUKAsource.o: /soft/root/include/TROOT.h GenTypeDefs.h AliGenFLUKAsource.o: /hdb2/offline/pro/include/AliMC.h AliGenFLUKAsource.o: /hdb2/offline/pro/include/AliRun.h AliGenFLUKAsource.o: /soft/root/include/TBrowser.h /soft/root/include/TList.h @@ -82,7 +82,7 @@ AliGenFLUKAsource.o: /usr/include/sys/types.h /usr/include/gnu/types.h AliGenFLUKAsource.o: /usr/include/time.h /usr/include/endian.h AliGenFLUKAsource.o: /usr/include/bytesex.h /usr/include/sys/select.h AliGenFLUKAsource.o: /usr/include/selectbits.h /usr/include/alloca.h -AliGenMUONlib.o: AliGenMUONlib.h /soft/root/include/TROOT.h +AliGenMUONlib.o: AliGenMUONlib.h /soft/root/include/TROOT.h GenTypeDefs.h AliGenMUONlib.o: /hdb2/offline/pro/include/AliRun.h AliGenMUONlib.o: /soft/root/include/TBrowser.h /soft/root/include/TList.h AliGenMUONlib.o: /soft/root/include/TStopwatch.h /soft/root/include/TTree.h @@ -189,7 +189,8 @@ AliGenHalo.o: AliGenHalo.h /hdb2/offline/pro/include/AliGenerator.h AliGenHalo.o: /soft/root/include/TNamed.h /soft/root/include/TArrayF.h AliGenHalo.o: /soft/root/include/TGenerator.h /soft/root/include/TF1.h AliGenHalo.o: /soft/root/include/TTree.h AliGenMUONlib.h -AliGenHalo.o: /soft/root/include/TROOT.h /hdb2/offline/pro/include/AliMC.h +AliGenHalo.o: /soft/root/include/TROOT.h GenTypeDefs.h +AliGenHalo.o: /hdb2/offline/pro/include/AliMC.h AliGenHalo.o: /hdb2/offline/pro/include/AliRun.h AliGenHalo.o: /soft/root/include/TBrowser.h /soft/root/include/TList.h AliGenHalo.o: /soft/root/include/TStopwatch.h /soft/root/include/TGeometry.h @@ -209,3 +210,53 @@ AliGenHalo.o: /usr/include/sys/types.h /usr/include/gnu/types.h AliGenHalo.o: /usr/include/time.h /usr/include/endian.h AliGenHalo.o: /usr/include/bytesex.h /usr/include/sys/select.h AliGenHalo.o: /usr/include/selectbits.h /usr/include/alloca.h +AliGenExtFile.o: AliGenExtFile.h /hdb2/offline/pro/include/AliGenerator.h +AliGenExtFile.o: /soft/root/include/TNamed.h /soft/root/include/TArrayF.h +AliGenExtFile.o: /soft/root/include/TGenerator.h /soft/root/include/TF1.h +AliGenExtFile.o: /soft/root/include/TTree.h AliGenMUONlib.h +AliGenExtFile.o: /soft/root/include/TROOT.h GenTypeDefs.h +AliGenExtFile.o: /hdb2/offline/pro/include/AliMC.h +AliGenExtFile.o: /hdb2/offline/pro/include/AliRun.h +AliGenExtFile.o: /soft/root/include/TBrowser.h /soft/root/include/TList.h +AliGenExtFile.o: /soft/root/include/TStopwatch.h +AliGenExtFile.o: /soft/root/include/TGeometry.h +AliGenExtFile.o: /hdb2/offline/pro/include/AliModule.h +AliGenExtFile.o: /soft/root/include/TClonesArray.h +AliGenExtFile.o: /soft/root/include/TAttLine.h +AliGenExtFile.o: /soft/root/include/TAttMarker.h /soft/root/include/TArrayI.h +AliGenExtFile.o: /hdb2/offline/pro/include/AliHit.h +AliGenExtFile.o: /soft/root/include/TObject.h +AliGenExtFile.o: /hdb2/offline/pro/include/AliHeader.h +AliGenExtFile.o: /hdb2/offline/pro/include/AliMagF.h +AliGenExtFile.o: /soft/root/include/TVector.h +AliGenExtFile.o: /hdb2/offline/pro/include/AliLego.h /soft/root/include/TH2.h +AliGenExtFile.o: /soft/root/include/TDirectory.h /soft/root/include/TFile.h +AliGenExtFile.o: /usr/include/stdlib.h /usr/include/features.h +AliGenExtFile.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h +AliGenExtFile.o: /usr/local/lib/gcc-lib/i686-pc-linux-gnu/egcs-2.91.60/include/stddef.h +AliGenExtFile.o: /usr/include/sys/types.h /usr/include/gnu/types.h +AliGenExtFile.o: /usr/include/time.h /usr/include/endian.h +AliGenExtFile.o: /usr/include/bytesex.h /usr/include/sys/select.h +AliGenExtFile.o: /usr/include/selectbits.h /usr/include/alloca.h +AliGenScan.o: AliGenScan.h /hdb2/offline/pro/include/AliGenerator.h +AliGenScan.o: /soft/root/include/TNamed.h /soft/root/include/TArrayF.h +AliGenScan.o: /soft/root/include/TGenerator.h /soft/root/include/TF1.h +AliGenScan.o: /soft/root/include/TTree.h /usr/include/stdlib.h +AliGenScan.o: /usr/include/features.h /usr/include/sys/cdefs.h +AliGenScan.o: /usr/include/gnu/stubs.h +AliGenScan.o: /usr/local/lib/gcc-lib/i686-pc-linux-gnu/egcs-2.91.60/include/stddef.h +AliGenScan.o: /usr/include/sys/types.h /usr/include/gnu/types.h +AliGenScan.o: /usr/include/time.h /usr/include/endian.h +AliGenScan.o: /usr/include/bytesex.h /usr/include/sys/select.h +AliGenScan.o: /usr/include/selectbits.h /usr/include/alloca.h +AliGenScan.o: /hdb2/offline/pro/include/AliRun.h /soft/root/include/TROOT.h +AliGenScan.o: /soft/root/include/TBrowser.h /soft/root/include/TList.h +AliGenScan.o: /soft/root/include/TStopwatch.h /soft/root/include/TGeometry.h +AliGenScan.o: /hdb2/offline/pro/include/AliModule.h +AliGenScan.o: /soft/root/include/TClonesArray.h /soft/root/include/TAttLine.h +AliGenScan.o: /soft/root/include/TAttMarker.h /soft/root/include/TArrayI.h +AliGenScan.o: /hdb2/offline/pro/include/AliHit.h /soft/root/include/TObject.h +AliGenScan.o: /hdb2/offline/pro/include/AliHeader.h +AliGenScan.o: /hdb2/offline/pro/include/AliMagF.h +AliGenScan.o: /soft/root/include/TVector.h /hdb2/offline/pro/include/AliMC.h +AliGenScan.o: /hdb2/offline/pro/include/AliLego.h /soft/root/include/TH2.h diff --git a/EVGEN/Makefile b/EVGEN/Makefile index 02a87268f78..6d51b0f51e2 100644 --- a/EVGEN/Makefile +++ b/EVGEN/Makefile @@ -11,7 +11,7 @@ PACKAGE = EVGEN SRCS = AliSimpleGen.cxx AliGenCocktail.cxx AliGenFLUKAsource.cxx \ AliGenMUONlib.cxx AliGenParam.cxx AliGenPythia.cxx \ - AliPythia.cxx DimuonCombinator.cxx AliGenHalo.cxx \ + AliPythia.cxx AliDimuCombinator.cxx AliGenHalo.cxx \ AliGenExtFile.cxx AliGenScan.cxx # C++ Headers -- 2.39.3