From 7e1e4c8f63639ef4a2784eccc8e9b2036e1308ab Mon Sep 17 00:00:00 2001 From: Rene Brun <Rene.Brun@cern.ch> Date: Fri, 12 May 2006 08:17:02 +0000 Subject: [PATCH] Fix coding conventions violations. git-svn-id: http://root.cern.ch/svn/root/trunk@15007 27541ba8-7e3a-0410-8455-c3a389f83636 --- pythia6/src/TPythia6Decayer.cxx | 10 +++++----- sql/inc/TSQLObjectData.h | 8 ++++---- sql/src/TSQLStructure.cxx | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pythia6/src/TPythia6Decayer.cxx b/pythia6/src/TPythia6Decayer.cxx index d2dd8b40789..ff8166a7475 100644 --- a/pythia6/src/TPythia6Decayer.cxx +++ b/pythia6/src/TPythia6Decayer.cxx @@ -1,4 +1,4 @@ -// @(#)root/pythia6:$Name: $:$Id: TPythia6Decayer.cxx,v 1.2 2006/04/25 15:56:07 rdm Exp $ +// @(#)root/pythia6:$Name: $:$Id: TPythia6Decayer.cxx,v 1.3 2006/05/11 10:12:36 brun Exp $ // Author: Christian Holm Christensen 22/04/06 // Much of this code has been lifted from AliROOT. @@ -245,7 +245,7 @@ void TPythia6Decayer::ForceDecay() ForceParticleDecay( 23, 13,2); // Z -> mu+ mu- break; case kHadronicD: - ForceHadronicD(); + ForceHadronicD(); break; case kPhiKK: ForceParticleDecay(333,321,2); // Phi->K+K- @@ -521,7 +521,7 @@ void TPythia6Decayer::ForceHadronicD() Int_t ilast = ifirst + pyth->GetMDCY(kc,3)-1; for (channel = ifirst; channel <= ilast; channel++) { - if ((pyth->GetKFDP(channel,1) == decayP1[ihadron][0] && + if ((pyth->GetKFDP(channel,1) == decayP1[ihadron][0] && pyth->GetKFDP(channel,2) == decayP1[ihadron][1] && pyth->GetKFDP(channel,3) == decayP1[ihadron][2] && pyth->GetKFDP(channel,4) == 0) || @@ -530,10 +530,10 @@ void TPythia6Decayer::ForceHadronicD() pyth->GetKFDP(channel,3) == decayP2[ihadron][2] && pyth->GetKFDP(channel,4) == 0)) { pyth->SetMDME(channel,1,1); - } else { + } else { pyth->SetMDME(channel,1,0); fBraPart[kc] -= pyth->GetBRAT(channel); - } // selected channel ? + } // selected channel ? } // decay channels } // hadrons } diff --git a/sql/inc/TSQLObjectData.h b/sql/inc/TSQLObjectData.h index 06be35485ee..3b0b5ae5996 100644 --- a/sql/inc/TSQLObjectData.h +++ b/sql/inc/TSQLObjectData.h @@ -1,4 +1,4 @@ -// @(#)root/sql:$Name: $:$Id: TSQLObjectData.h,v 1.5 2006/02/01 18:57:41 pcanal Exp $ +// @(#)root/sql:$Name: $:$Id: TSQLObjectData.h,v 1.6 2006/05/11 10:29:45 brun Exp $ // Author: Sergey Linev 20/11/2005 /************************************************************************* @@ -53,7 +53,7 @@ protected: TString fClassName; Version_t fVersion; -ClassDef(TSQLObjectInfo, 1) // Info (classname, version) about object in database + ClassDef(TSQLObjectInfo, 1) //Info (classname, version) about object in database }; @@ -112,7 +112,7 @@ protected: TString fBlobName2; //! TObjArray* fUnpack; //! - ClassDef(TSQLObjectData, 1); // Keeps the data requested from the SQL server for an object. + ClassDef(TSQLObjectData, 1) // Keeps the data requested from the SQL server for an object. }; @@ -136,7 +136,7 @@ protected: Bool_t fIsMoreRows; //! indicates if class data has not yet read rows TList* fRowsPool; //! pool of extrcted, but didnot used rows -ClassDef(TSQLObjectDataPool,1); +ClassDef(TSQLObjectDataPool,1) //XML object keeper class }; diff --git a/sql/src/TSQLStructure.cxx b/sql/src/TSQLStructure.cxx index dcf43dd576d..474ee804aa0 100644 --- a/sql/src/TSQLStructure.cxx +++ b/sql/src/TSQLStructure.cxx @@ -1,4 +1,4 @@ -// @(#)root/sql:$Name: $:$Id: TSQLStructure.cxx,v 1.9 2006/04/18 14:19:21 rdm Exp $ +// @(#)root/sql:$Name: $:$Id: TSQLStructure.cxx,v 1.10 2006/05/11 10:29:45 brun Exp $ // Author: Sergey Linev 20/11/2005 /************************************************************************* @@ -418,8 +418,8 @@ TClass* TSQLStructure::GetCustomClass() const //________________________________________________________________________ Version_t TSQLStructure::GetCustomClassVersion() const - //please Sergey: document this function { + //please Sergey: document this function return (fType==kSqlCustomClass) ? fArrayIndex : 0; } @@ -1674,8 +1674,8 @@ Int_t TSQLStructure::DefineElementColumnType(TStreamerElement* elem, TSQLFile* f (typ==TStreamerInfo::kObjectp + TStreamerInfo::kOffsetL) || (typ==TStreamerInfo::kAnyP + TStreamerInfo::kOffsetL) || (typ==TStreamerInfo::kObjectP + TStreamerInfo::kOffsetL)) - if (elem->GetStreamer()!=0) return kColNormObject; - else return kColNormObjectArray; + if (elem->GetStreamer()!=0) return kColNormObject; + else return kColNormObjectArray; if ((typ==TStreamerInfo::kObject) || (typ==TStreamerInfo::kAny) || -- GitLab