From: mtadel Date: Fri, 18 Jan 2008 21:04:54 +0000 (+0000) Subject: Remove trailing whitespace. X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=51346b82dbc474790b0d56deccb62d2bb40ccdfe;p=u%2Fmrichter%2FAliRoot.git Remove trailing whitespace. --- diff --git a/EVE/Alieve/AliEveEventManager.cxx b/EVE/Alieve/AliEveEventManager.cxx index 81a194a6675..12bceaee300 100644 --- a/EVE/Alieve/AliEveEventManager.cxx +++ b/EVE/Alieve/AliEveEventManager.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveEventManager.h" @@ -36,7 +36,7 @@ // // Missing support for raw-data. For now this is handled individually // by each sub-detector. -// +// ClassImp(AliEveEventManager) @@ -122,7 +122,7 @@ void AliEveEventManager::Open() else Warning(eH, "Bootstraping of run-loader failed."); } - + TString esd_path(Form("%s/AliESDs.root", fPath.Data())); if (gSystem->AccessPathName(esd_path, kReadPermission) == kFALSE) @@ -167,7 +167,7 @@ void AliEveEventManager::Open() if (fgAssertESDTree) { throw(eH + "ESD not initialized. Its precence was requested."); - } else { + } else { Warning(eH, "ESD not initialized."); } } diff --git a/EVE/Alieve/AliEveEventManager.h b/EVE/Alieve/AliEveEventManager.h index 2df06891a76..a7e83a8a97a 100644 --- a/EVE/Alieve/AliEveEventManager.h +++ b/EVE/Alieve/AliEveEventManager.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_EventAlieve_H diff --git a/EVE/Alieve/AliEveHOMERManager.cxx b/EVE/Alieve/AliEveHOMERManager.cxx index fb1c5bdc7db..f773b6b2423 100644 --- a/EVE/Alieve/AliEveHOMERManager.cxx +++ b/EVE/Alieve/AliEveHOMERManager.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ /************************************************************************** * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * @@ -23,7 +23,7 @@ /** @file AliEveHOMERManager.cxx @author Jochen Thaeder - @date + @date @brief Manger for HOMER in offline */ @@ -73,8 +73,8 @@ ClassImp(AliEveHOMERManager) /* * --------------------------------------------------------------------------------- - * Constructor / Destructor - * --------------------------------------------------------------------------------- + * Constructor / Destructor + * --------------------------------------------------------------------------------- */ //################################################################################## @@ -83,7 +83,7 @@ AliEveHOMERManager::AliEveHOMERManager( TString xmlFile ) : fLibManager(new AliHLTHOMERLibManager), fXMLFile(xmlFile), - fXMLParser(NULL), + fXMLParser(NULL), fRootNode(NULL), fSourceList(NULL), fReader(NULL), @@ -130,7 +130,7 @@ AliEveHOMERManager::~AliEveHOMERManager() { fReader = NULL; } - if ( fXMLParser ) + if ( fXMLParser ) delete fXMLParser; fXMLParser = NULL; @@ -150,7 +150,7 @@ AliEveHOMERManager::~AliEveHOMERManager() { /* * --------------------------------------------------------------------------------- * Source Handling - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ //################################################################################## @@ -164,7 +164,7 @@ Int_t AliEveHOMERManager::CreateHOMERSourcesList() { fXMLParser = new TDOMParser(); fXMLParser->SetValidate( kFALSE ); - + Int_t iResult = fXMLParser->ParseFile( fXMLFile ); if ( iResult < 0 ) { iResult = 1; @@ -177,13 +177,13 @@ Int_t AliEveHOMERManager::CreateHOMERSourcesList() { if ( fSourceList != NULL ) delete fSourceList; fSourceList = NULL; - + fSourceList = new TList(); fSourceList->SetOwner( kTRUE ); // -- Set ROOT node fRootNode = fXMLParser->GetXMLDocument()->GetRootNode(); - + TXMLNode * node = NULL; TXMLNode * prevNode = fRootNode->GetChildren(); @@ -194,21 +194,21 @@ Int_t AliEveHOMERManager::CreateHOMERSourcesList() { // -- Find only "Process" nodes, otherwise continue to next node if ( strcmp( node->GetNodeName(), "Proc" ) != 0 ) continue; - + // -- Get Attributes of current node TList *attrList = node->GetAttributes(); TXMLAttr *attr = 0; TIter next(attrList); - + while ( ( attr = (TXMLAttr*)next() ) ) { - + // -- Find "ID" attribute, otherwise continue to next attribute - if ( strcmp( attr->GetName(), "ID" ) != 0 ) + if ( strcmp( attr->GetName(), "ID" ) != 0 ) continue; - + TString nodeId( attr->GetValue() ); - // -- Find only TDS processes + // -- Find only TDS processes TObjArray * nodeIdTok = nodeId.Tokenize("_"); for ( Int_t ii=0 ; ii < nodeIdTok->GetEntries() ; ii++ ) { @@ -262,7 +262,7 @@ void AliEveHOMERManager::SetSourceState( AliHLTHOMERSourceDesc * source, Bool_t //################################################################################## Int_t AliEveHOMERManager::GetTDSAttributes( TXMLNode * xmlNode ) { // see header file for class documentation - + Int_t iResult = 0; TXMLNode * attrNode = NULL; @@ -271,26 +271,26 @@ Int_t AliEveHOMERManager::GetTDSAttributes( TXMLNode * xmlNode ) { TString xmlHostname = 0; TString xmlPort = 0; - TString hostname = 0; + TString hostname = 0; Int_t port = 0; // -- Get hostname and port from TDS node out of XML while ( ( attrNode = prevNode->GetNextNode() ) ) { prevNode = attrNode; - + // -- Get port out of the commandline if ( strcmp( attrNode->GetNodeName(), "Cmd" ) == 0 ) { TString cmd( attrNode->GetText() ); - + TObjArray * cmdTok = cmd.Tokenize(" "); xmlPort = ((TObjString*) cmdTok->At(2))->GetString(); - } + } // -- Get hostname - else if ( strcmp( attrNode->GetNodeName(), "Node" ) == 0 ) + else if ( strcmp( attrNode->GetNodeName(), "Node" ) == 0 ) xmlHostname = attrNode->GetText(); } // while ( ( attrNode = prevNode->GetNextNode() ) ) { - + // -- Resolve hostname and port information iResult = ResolveHostPortInformation ( xmlHostname, xmlPort, hostname, port ); if ( iResult == 1 ) { @@ -303,33 +303,33 @@ Int_t AliEveHOMERManager::GetTDSAttributes( TXMLNode * xmlNode ) { } // -- Reset loop to TDS node - prevNode = xmlNode; + prevNode = xmlNode; // -- Get Sources out of XML, resolve sources, add to sources ListxmlHostname.Data() while ( ( attrNode = prevNode->GetNextNode() ) ) { prevNode = attrNode; - + // Find only "Parent" tags, otherwise continue to next tag - if ( strcmp( attrNode->GetNodeName(), "Parent" ) != 0 ) + if ( strcmp( attrNode->GetNodeName(), "Parent" ) != 0 ) continue; TString xmlParent = attrNode->GetText(); - + AliHLTHOMERSourceDesc * source = new AliHLTHOMERSourceDesc( hostname, port ); - + if ( ResolveSourceInformation( xmlParent, source ) ) { iResult = 3; AliError( Form("Error resolving source : %s", xmlParent.Data()) ); - + delete source; } else { fSourceList->Add( source ); AliInfo( Form("New Source added : %s", xmlParent.Data()) ); } - + } // while ( ( attrNode = prevNode->GetNextNode() ) ) { - + return iResult; } @@ -346,7 +346,7 @@ Int_t AliEveHOMERManager::ResolveHostPortInformation ( TString xmlHostname, TStr TString nodeName = 0; while ( ( node = prevNode->GetNextNode() ) && iResult == 1 ) { prevNode = node; - + // -- Find only "Node" nodes, otherwise continue if ( strcmp( node->GetNodeName(), "Node" ) != 0 ) continue; @@ -355,17 +355,17 @@ Int_t AliEveHOMERManager::ResolveHostPortInformation ( TString xmlHostname, TStr TList *attrList = node->GetAttributes(); TXMLAttr *attr = 0; TIter next(attrList); - + TString nodeId = 0; // TString nodeName = 0; - + // Get "nodeID" and "nodeName" of this "Node" node while ( ( attr = (TXMLAttr*)next() ) ) { if ( strcmp( attr->GetName(), "ID" ) == 0 ) nodeId = attr->GetValue(); else if ( strcmp( attr->GetName(), "hostname" ) == 0 ) nodeName = attr->GetValue(); - } + } // -- if this is not the correct nodeID continue if ( nodeId != xmlHostname ) @@ -391,19 +391,19 @@ Int_t AliEveHOMERManager::ResolveHostPortInformation ( TString xmlHostname, TStr // *** Resolve port if ( xmlPort.IsDigit() ) { - + if ( nodeName.CompareTo("feptriggerdet") ==0 ){ if ( xmlPort.CompareTo("49152") == 0 ){ port = 58140; } else if ( xmlPort.CompareTo("49153") == 0 ){ port = 58141; - } + } } else if ( nodeName.CompareTo("fepfmdaccorde") == 0 ){ if ( xmlPort.CompareTo("49152") == 0 ){ port = 58144; } else if ( xmlPort.CompareTo("49153") == 0 ){ port = 58145; - } + } } else if ( nodeName.CompareTo("feptpcao15") == 0 ){ if ( xmlPort.CompareTo("49152") == 0 ){ port = 50340; @@ -422,7 +422,7 @@ Int_t AliEveHOMERManager::ResolveHostPortInformation ( TString xmlHostname, TStr // *** Summary if ( !iResult ) { - AliInfo( Form("%s:%i resolved out of %s:%s", hostname.Data(), port, xmlHostname.Data(), xmlPort.Data()) ); + AliInfo( Form("%s:%i resolved out of %s:%s", hostname.Data(), port, xmlHostname.Data(), xmlPort.Data()) ); } return iResult; @@ -440,11 +440,11 @@ Int_t AliEveHOMERManager::ResolveSourceInformation( TString xmlParent, AliHLTHOM return iResult; } - + TObjArray * parentTokens = xmlParent.Tokenize("_"); - + Int_t nEntries = parentTokens->GetEntries(); - + TString detector = ((TObjString*) parentTokens->At(0) )->GetString(); TString subDetector = ""; TString subSubDetector = ""; @@ -453,14 +453,14 @@ Int_t AliEveHOMERManager::ResolveSourceInformation( TString xmlParent, AliHLTHOM TString name = ((TObjString*) parentTokens->At(1) )->GetString(); TString objName = ""; - - if ( nEntries == 3 ) - subDetector = ((TObjString*) parentTokens->At(2) )->GetString(); + + if ( nEntries == 3 ) + subDetector = ((TObjString*) parentTokens->At(2) )->GetString(); else if ( nEntries == 4 ) { - subDetector = ((TObjString*) parentTokens->At(2) )->GetString(); - subSubDetector = ((TObjString*) parentTokens->At(3) )->GetString(); + subDetector = ((TObjString*) parentTokens->At(2) )->GetString(); + subSubDetector = ((TObjString*) parentTokens->At(3) )->GetString(); } - + // -- Corecct TPC subdetector, because in we have somtimes "A","C" if ( ! detector.CompareTo("TPC") ) { if ( subDetector.BeginsWith('A') ) { @@ -485,28 +485,28 @@ Int_t AliEveHOMERManager::ResolveSourceInformation( TString xmlParent, AliHLTHOM objName = ""; dataType = "DDL_RAW"; specification = 0; - } + } // **** TPC **** else if ( detector == "TPC" ) { - + if ( name == "CalibPedestal" ) { objName = "AliTPCCalibPedestal"; dataType = "HIS_CAL"; specification = 0; } else if ( name == "CalibPulser" ) { - objName = "AliTPCCalibPulser"; + objName = "AliTPCCalibPulser"; dataType = "HIS_CAL"; specification = 0; } else if ( name == "CF" || name == "RelayCF" ) { - objName = "AliHLTTPCClusterDataFormat"; + objName = "AliHLTTPCClusterDataFormat"; dataType = "CLUSTERS"; specification = 0; } else if ( name == "ESDConv" ) { - objName = "AliESDEvent"; + objName = "AliESDEvent"; dataType = "ESD_TREE"; specification = 0; } @@ -532,7 +532,7 @@ Int_t AliEveHOMERManager::ResolveSourceInformation( TString xmlParent, AliHLTHOM else if ( detector == "MUON" ) { } // else if ( detector == "MUON" ) { - + // -- Fill object source->SetSourceName( name, objName ); source->SetSourceType( specification, dataType ); @@ -540,7 +540,7 @@ Int_t AliEveHOMERManager::ResolveSourceInformation( TString xmlParent, AliHLTHOM AliInfo( Form("Set Source %s , Type %s, ClassName %s .", name.Data(), dataType.Data(), objName.Data()) ); - AliInfo( Form(" Detector %s , SubDetector : %s, SubSubDetector %s .", + AliInfo( Form(" Detector %s , SubDetector : %s, SubSubDetector %s .", detector.Data(), subDetector.Data(), subSubDetector.Data()) ); return iResult; @@ -549,23 +549,23 @@ Int_t AliEveHOMERManager::ResolveSourceInformation( TString xmlParent, AliHLTHOM /* * --------------------------------------------------------------------------------- * Connection Handling - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ //################################################################################## Int_t AliEveHOMERManager::ConnectHOMER(){ // see header file for class documentation - Int_t iResult = 0; + Int_t iResult = 0; // -- Check if already connected and state has not changed if ( fStateHasChanged == kFALSE && IsConnected() ) { AliInfo( Form("No need for reconnection.") ); return iResult; } - + // -- If already connected, disconnect before connect - if ( IsConnected() ) + if ( IsConnected() ) DisconnectHOMER(); // *** Create the Readoutlist @@ -575,28 +575,28 @@ Int_t AliEveHOMERManager::ConnectHOMER(){ UInt_t sourceCount = 0; CreateReadoutList( sourceHostnames, sourcePorts, sourceCount ); - + if ( sourceCount == 0 ) { AliError(Form("No sources selected, aborting.") ); return iResult; } // *** Connect to data sources - + if ( !fReader ) { - if ( fLibManager ) + if ( fLibManager ) fReader = fLibManager->OpenReader( sourceCount, sourceHostnames, sourcePorts ); } - + iResult = fReader->GetConnectionStatus(); - - if ( iResult ) { - // -- Connection failed - + + if ( iResult ) { + // -- Connection failed + UInt_t ndx = fReader->GetErrorConnectionNdx(); - + if ( ndx < sourceCount ) { - AliError( Form("Error : Error establishing connection to TCP source %s:%hu: %s (%d)", + AliError( Form("Error : Error establishing connection to TCP source %s:%hu: %s (%d)", sourceHostnames[ndx], sourcePorts[ndx], strerror(iResult), iResult) ); } else { @@ -608,22 +608,22 @@ Int_t AliEveHOMERManager::ConnectHOMER(){ fLibManager->DeleteReader( fReader ); fReader = NULL; - } + } else { // -- Connection ok - set reader - fConnected = kTRUE; - + fConnected = kTRUE; + AliInfo( Form("Connection established") ); } - + delete[] sourceHostnames; delete[] sourcePorts; - + // -- Get next event if ( ! iResult ) NextEvent(); - + return iResult; } @@ -640,7 +640,7 @@ void AliEveHOMERManager::DisconnectHOMER(){ fStateHasChanged = kTRUE; fConnected = kFALSE; - + AliInfo( Form("Connection closed") ); return; @@ -674,9 +674,9 @@ void AliEveHOMERManager::CreateReadoutList( const char** sourceHostnames, UShort TIter next( fSourceList ); while ( ( source = (AliHLTHOMERSourceDesc*)next() ) ) { - if ( ! source->IsSelected() ) + if ( ! source->IsSelected() ) continue; - + Bool_t exists = kFALSE; // -- Loop over existing entries and check if entry is already in readout list @@ -686,7 +686,7 @@ void AliEveHOMERManager::CreateReadoutList( const char** sourceHostnames, UShort break; } } - + // -- Add new entires to readout list if ( ! exists ) { sourcePorts[sourceCount] = source->GetPort(); @@ -704,39 +704,39 @@ void AliEveHOMERManager::CreateReadoutList( const char** sourceHostnames, UShort /* * --------------------------------------------------------------------------------- * AliEveEventManager Handling - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ //################################################################################## Int_t AliEveHOMERManager::NextEvent(){ // see header file for class documentation - + Int_t iResult = 0; - + if ( !fReader || ! IsConnected() ) { AliWarning( Form( "Not connected yet." ) ); return 1; } - + // -- Read next event data and error handling for HOMER (error codes and empty blocks) while( 1 ) { iResult = fReader->ReadNextEvent( 20000000 /*timeout in us*/); - + if ( iResult == 111 || iResult == 32 || iResult == 6 ) { Int_t ndx = fReader->GetErrorConnectionNdx(); AliError( Form("Error, No Connection to source %d: %s (%d)", ndx, strerror(iResult), iResult) ); - + return 2; } else if ( iResult == 110 ) { Int_t ndx = fReader->GetErrorConnectionNdx(); AliError( Form("Timout occured, reading event from source %d: %s (%d)", ndx, strerror(iResult), iResult) ); - return 3; + return 3; } else if ( iResult == 56) { Int_t ndx = fReader->GetErrorConnectionNdx(); AliError( Form("Error reading event from source %d: %s (%d) -- IRESULTRY", ndx, strerror(iResult), iResult) ); - continue; + continue; } else if ( iResult ) { Int_t ndx = fReader->GetErrorConnectionNdx(); @@ -748,7 +748,7 @@ Int_t AliEveHOMERManager::NextEvent(){ } } // while( 1 ) { - if ( iResult ) + if ( iResult ) return iResult; @@ -801,28 +801,28 @@ Int_t AliEveHOMERManager::CreateBlockList() { // -- Fill block list while ( iter != NULL ){ - + // -- Create new block - AliHLTHOMERBlockDesc * block = new AliHLTHOMERBlockDesc( GetBlk(), GetBlkSize(), GetBlkOrigin(), + AliHLTHOMERBlockDesc * block = new AliHLTHOMERBlockDesc( GetBlk(), GetBlkSize(), GetBlkOrigin(), GetBlkType(), GetBlkSpecification() ); - + // -- Check sources list if block is requested if ( CheckIfRequested( block ) ) - fBlockList->Add( block ); - else + fBlockList->Add( block ); + else delete block; - + iter = GetNextBlk(); - + } // while ( iter != NULL ){ - + return iResult; } /* * --------------------------------------------------------------------------------- * BlockHandling - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ //################################################################################## @@ -830,12 +830,12 @@ void* AliEveHOMERManager::GetBlk( Int_t ndx ) { // see header file for class documentation void* data = NULL; - + if ( !fReader || ! IsConnected() ) { - AliError( Form("Not connected yet.") ); + AliError( Form("Not connected yet.") ); } else { - if ( ( ndx ) < (Int_t) fNBlks ) + if ( ( ndx ) < (Int_t) fNBlks ) data = (void*) fReader->GetBlockData( ndx ); } @@ -849,10 +849,10 @@ ULong_t AliEveHOMERManager::GetBlkSize( Int_t ndx ) { ULong_t length = 0; if ( !fReader || ! IsConnected() ) { - AliError( Form("Not connected yet.") ); + AliError( Form("Not connected yet.") ); } else { - if ( ( ndx ) < (Int_t) fNBlks ) + if ( ( ndx ) < (Int_t) fNBlks ) length = (ULong_t) fReader->GetBlockDataLength( ndx ); } @@ -867,14 +867,14 @@ TString AliEveHOMERManager::GetBlkOrigin( Int_t ndx ) { // -- Check for Connection if ( !fReader || ! IsConnected() ) { - AliError( Form("Not connected yet.") ); + AliError( Form("Not connected yet.") ); return origin; } // -- Check block index if ( ( ndx ) >= (Int_t) fNBlks ) { - AliError( Form("Block index %d out of range.", ndx ) ); - return origin; + AliError( Form("Block index %d out of range.", ndx ) ); + return origin; } // -- Get origin @@ -901,14 +901,14 @@ TString AliEveHOMERManager:: GetBlkType( Int_t ndx ) { // -- Check for Connection if ( !fReader || ! IsConnected() ) { - AliError( Form("Not connected yet.") ); + AliError( Form("Not connected yet.") ); return type; } // -- Check blockk index if ( ( ndx ) >= (Int_t) fNBlks ) { - AliError( Form("Block index %d out of range.", ndx ) ); - return type; + AliError( Form("Block index %d out of range.", ndx ) ); + return type; } // -- Get type @@ -937,16 +937,16 @@ ULong_t AliEveHOMERManager:: GetBlkSpecification( Int_t ndx ) { // -- Check for Connection if ( !fReader || ! IsConnected() ) { - AliError( Form("Not connected yet.") ); + AliError( Form("Not connected yet.") ); return spec; } // -- Check blockk index if ( ( ndx ) >= (Int_t) fNBlks ) { - AliError( Form("Block index %d out of range.", ndx ) ); - return spec; + AliError( Form("Block index %d out of range.", ndx ) ); + return spec; } - + spec = (ULong_t) fReader->GetBlockDataSpec( ndx ); return spec; @@ -957,14 +957,14 @@ Bool_t AliEveHOMERManager::CheckIfRequested( AliHLTHOMERBlockDesc * block ) { // see header file for class documentation Bool_t requested = kFALSE; - + AliHLTHOMERSourceDesc * source= NULL; - + // -- Read all sources and check if they should be read out TIter next( fSourceList ); while ( ( source = (AliHLTHOMERSourceDesc*)next() ) ) { - if ( ! source->IsSelected() ) + if ( ! source->IsSelected() ) continue; if ( source->GetDetector().CompareTo( block->GetDetector() ) ) @@ -977,21 +977,21 @@ Bool_t AliEveHOMERManager::CheckIfRequested( AliHLTHOMERBlockDesc * block ) { if ( source->GetSubDetector().Atoi() != block->GetSubDetector().Atoi() ) continue; - + if ( ! block->HasSubSubDetectorRange() ) { - + // if ( source->GetSubSubDetector().Atoi() != block->GetSubSubDetector().Atoi() ) // continue; - + } // if ( ! block->HasSubSubDetectorRange ) { } // if ( ! block->HasSubDetectorRange ) { - + requested = kTRUE; - + } // while ( ( source = (AliHLTHOMERSourceDesc*)next() ) ) { - + if ( requested) { - AliInfo( Form("Block requested : %s - %s : %s/%s -> %s ", block->GetDetector().Data(), block->GetDataType().Data(), + AliInfo( Form("Block requested : %s - %s : %s/%s -> %s ", block->GetDetector().Data(), block->GetDataType().Data(), block->GetSubDetector().Data(), block->GetSubSubDetector().Data(), block->GetClassName().Data() ) ); } else @@ -1015,13 +1015,13 @@ void AliEveHOMERManager::TestSelectClass( TString objectName ) { // see header file for class documentation TList* srcList = GetSourceList(); - + AliHLTHOMERSourceDesc *desc = 0; TIter next(srcList); - + while ( ( desc = (AliHLTHOMERSourceDesc*)next() ) ) { - if ( ! desc->GetClassName().CompareTo( objectName ) ) + if ( ! desc->GetClassName().CompareTo( objectName ) ) desc->Select(); } } @@ -1031,11 +1031,11 @@ void AliEveHOMERManager::SelectRawTPC() { // see header file for class documentation TList* srcList = GetSourceList(); - + AliHLTHOMERSourceDesc *desc = 0; TIter next(srcList); - + while ( ( desc = (AliHLTHOMERSourceDesc*)next() ) ) { if ( ! desc->GetDataType().CompareTo( "DDL_RAW" ) ) { desc->Select(); @@ -1048,11 +1048,11 @@ void AliEveHOMERManager::SelectClusterTPC() { // see header file for class documentation TList* srcList = GetSourceList(); - + AliHLTHOMERSourceDesc *desc = 0; TIter next(srcList); - + while ( ( desc = (AliHLTHOMERSourceDesc*)next() ) ) { if ( ! desc->GetDataType().CompareTo( "CLUSTERS" ) ) { desc->Select(); @@ -1065,11 +1065,11 @@ void AliEveHOMERManager::SelectESDTPC() { // see header file for class documentation TList* srcList = GetSourceList(); - + AliHLTHOMERSourceDesc *desc = 0; TIter next(srcList); - + while ( ( desc = (AliHLTHOMERSourceDesc*)next() ) ) { if ( ! desc->GetDataType().CompareTo( "ESD_TREE" ) ) { desc->Select(); @@ -1090,11 +1090,11 @@ void AliEveHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { AliHLTHOMERBlockDesc *desc = 0; TIter next(blockList); - + while ( ( desc = (AliHLTHOMERBlockDesc*)next() ) ) { if ( ! desc->IsTObject() ) continue; - + Int_t sectorTPC = 0; if ( desc->GetSubSubDetector().Atoi() <= 1 ) { @@ -1103,7 +1103,7 @@ void AliEveHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { else { sectorTPC = 36 + desc->GetSubDetector().Atoi(); } - + if ( ! objectName.CompareTo( desc->GetClassName() ) ){ // @@ -1112,13 +1112,13 @@ void AliEveHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { if ( ! objectName.CompareTo( "AliTPCCalibPedestal" ) ) { AliTPCCalROC* calROC = NULL; - + AliTPCCalibPedestal * cal = (AliTPCCalibPedestal*) desc->GetTObject(); if ( cal == NULL ) { cout << "error 1" << endl; continue; } - + cal->Analyse(); calROC = cal->GetCalRocRMS(sectorTPC); @@ -1126,7 +1126,7 @@ void AliEveHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { cout << "error 2" << endl; continue; } - + calROC->SetName(Form("RMS_ROC%d", sectorTPC)); fTPCPre->AddComponent((TObject*) calROC ); @@ -1135,7 +1135,7 @@ void AliEveHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { cout << "error 3" << endl; continue; } - + calROC->SetName(Form("Pedestal_ROC%d", sectorTPC)); cout << "added" << endl; @@ -1152,7 +1152,7 @@ void AliEveHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { AliTPCCalibPulser * cal = (AliTPCCalibPulser*) desc->GetTObject(); cal->Analyse(); - + calROC = cal->GetCalRocT0(sectorTPC); calROC->SetName(Form("T0_ROC%d", sectorTPC)); fTPCPre->AddComponent((TObject*) calROC ); @@ -1169,7 +1169,7 @@ void AliEveHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { calROC->SetName(Form("Outliers_ROC%d", sectorTPC)); fTPCPre->AddComponent((TObject*) calROC ); } - + */ // // AliTPCCalibCE @@ -1181,7 +1181,7 @@ void AliEveHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { AliTPCCalibPulser * cal = (AliTPCCalibPulser*) desc->GetTObject(); cal->Analyse(); - + calROC = cal->GetCalRocT0(sectorTPC); calROC->SetName(Form("T0_ROC%d", sectorTPC)); fTPCPre->AddComponent((TObject*) calROC ); @@ -1200,7 +1200,7 @@ void AliEveHOMERManager::DumpTPCCalib(TString objectName, Bool_t dumpToFile) { } */ } // if ( ! objectName.CompareTo( desc->GetClassName() ) ) { - + } // while ( ( desc = (AliHLTHOMERBlockDesc*)next() ) ) { if ( dumpToFile ) { diff --git a/EVE/Alieve/AliEveHOMERManager.h b/EVE/Alieve/AliEveHOMERManager.h index d0667a7d8a7..23e4c5012d2 100644 --- a/EVE/Alieve/AliEveHOMERManager.h +++ b/EVE/Alieve/AliEveHOMERManager.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ //-*- Mode: C++ -*- #ifndef ALIEVEHOMERMANGER_H @@ -15,7 +15,7 @@ /** @file AliEveHOMERManager.h @author Jochen Thaeder - @date + @date @brief Manager for HOMER in offline */ @@ -37,7 +37,7 @@ class AliHLTHOMERLibManager; /** * @class AliEveHOMERManager - * + * * This class is the main class of the AliEveHOMERManager * ... more to come * @@ -50,28 +50,28 @@ public: /* * --------------------------------------------------------------------------------- - * Constructor / Destructor - * --------------------------------------------------------------------------------- + * Constructor / Destructor + * --------------------------------------------------------------------------------- */ - /** constructor + /** constructor * @param argc Number of command line arguments. * @param argv Array of command line arguments. */ - AliEveHOMERManager(TString xmlFile="" ); + AliEveHOMERManager(TString xmlFile="" ); /** not a valid copy constructor, defined according to effective C++ style */ - AliEveHOMERManager( const AliEveHOMERManager& ); + AliEveHOMERManager( const AliEveHOMERManager& ); /** not a valid assignment op, but defined according to effective C++ style */ - AliEveHOMERManager& operator=( const AliEveHOMERManager& ); + AliEveHOMERManager& operator=( const AliEveHOMERManager& ); /** destructor */ virtual ~AliEveHOMERManager(); /* * --------------------------------------------------------------------------------- * Source Handling - public - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ - + /** Create Sources List from HOMER-Proxy */ Int_t CreateHOMERSourcesList(); @@ -79,7 +79,7 @@ public: * @param source Pointer to AliHLTHOMERSourceDesc object. * @param state New (selected/not selected) state. */ - void SetSourceState( AliHLTHOMERSourceDesc* source, Bool_t state); + void SetSourceState( AliHLTHOMERSourceDesc* source, Bool_t state); /** Get pointer to source List * @return returns pointer to TList of sources @@ -89,11 +89,11 @@ public: /* * --------------------------------------------------------------------------------- * Connection Handling - public - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ - + /** Connect to HOMER sources, out of Readout List, which gets created when state has changed - * @return 0 on sucess, "HOMER" errors on error + * @return 0 on sucess, "HOMER" errors on error */ Int_t ConnectHOMER(); @@ -108,14 +108,14 @@ public: /* * --------------------------------------------------------------------------------- * AliEveEventManager Handling - public - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ - /** Loads the next AliEveEventManager, after being connected - * @return 0 on sucess, "HOMER" errors on error + /** Loads the next AliEveEventManager, after being connected + * @return 0 on sucess, "HOMER" errors on error */ Int_t NextEvent(); - + /** Get event ID * @return Returns eventID */ @@ -144,19 +144,19 @@ protected: /** Dynamic loader manager for the HOMER library */ AliHLTHOMERLibManager* fLibManager; //! transient - + private: /* * --------------------------------------------------------------------------------- * Source Handling - private - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ - + /** Get Information out of a TDS process in XML file * @param xmlNode Pointer to childs of TDS node - * @return 0 on sucess, > 0 on error + * @return 0 on sucess, > 0 on error */ Int_t GetTDSAttributes( TXMLNode * xmlNode ); @@ -166,11 +166,11 @@ private: * @param xmlPort Port out of the XML * @param hostname Return of the hostname * @param port Return of the port - * @return 0 on sucess, 1 if hostname couldn't be resolved, 2 if port couldn't be resolved, + * @return 0 on sucess, 1 if hostname couldn't be resolved, 2 if port couldn't be resolved, */ Int_t ResolveHostPortInformation( TString xmlHostname, TString xmlPort, TString &hostname, Int_t &port ); - /** Resolve information of source + /** Resolve information of source * @param xmlParent ParentString out of the XML * @param source Return the filled AliHLTHOMERSourceDesc object * @return 0 on sucess, 1 on error @@ -180,10 +180,10 @@ private: /* * --------------------------------------------------------------------------------- * Connection Handling - private - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ - - /** Create a readout list for Hostname and ports + + /** Create a readout list for Hostname and ports * @param socurceHostnames Array of selected hostnames * @param socurcePorts Array of selected ports * @param socurceCount Number of selected hostname:port @@ -197,16 +197,16 @@ private: /* --------------------------------------------------------------------------------- * Eve AliEveHOMERManager::foo(nt Handling - private - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ - + /** Create a TList of blocks, which have been readout */ Int_t CreateBlockList(); /* * --------------------------------------------------------------------------------- * Block Handling - private - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ /** Get Number of blocks in current event @@ -247,13 +247,13 @@ private: * @return returns pointer to blk, 0 if no block present */ ULong_t GetBlkSize() { return GetBlkSize( fCurrentBlk ); } - + /** Get origin of block ndx * @param ndx Block index * @return origin of block */ - TString GetBlkOrigin( Int_t ndx ); - + TString GetBlkOrigin( Int_t ndx ); + /** Get origin of current block * @param ndx Block index * @return origin of block @@ -281,7 +281,7 @@ private: /** Get specification of current block * @param ndx Block index * @return specification of block - */ + */ ULong_t GetBlkSpecification(){ return GetBlkSpecification( fCurrentBlk ); } /** Checks if current Block should was requested @@ -292,7 +292,7 @@ private: /* * --------------------------------------------------------------------------------- * Members - private - * --------------------------------------------------------------------------------- + * --------------------------------------------------------------------------------- */ // == XML parser == @@ -301,29 +301,29 @@ private: TString fXMLFile; // see above /** XML parser into DOM model */ - TDOMParser* fXMLParser; //! transient - + TDOMParser* fXMLParser; //! transient + /** Root node of parsed config file */ - TXMLNode * fRootNode; //! transient + TXMLNode * fRootNode; //! transient // == sources == /** List to HOMER sources */ - TList * fSourceList; //! transient + TList * fSourceList; //! transient // == connection == - + /** Pointer to HOMER reader */ - AliHLTHOMERReader* fReader; //! transient + AliHLTHOMERReader* fReader; //! transient // == blocks == /** List to HOMER blocks */ - TList * fBlockList; //! transient + TList * fBlockList; //! transient // == events == - + /** Number of blockes in current event */ ULong_t fNBlks; // see above @@ -332,13 +332,13 @@ private: /** Current block in current event */ ULong_t fCurrentBlk; // see above - + // == states == /** Shows connection status */ Bool_t fConnected; // see above - /** Indicates, if a sources have changes, + /** Indicates, if a sources have changes, * so that one has to reconnect . */ Bool_t fStateHasChanged; // see above diff --git a/EVE/Alieve/AliEveHOMERManagerEditor.cxx b/EVE/Alieve/AliEveHOMERManagerEditor.cxx index d8f0081b77c..7868a5e818d 100644 --- a/EVE/Alieve/AliEveHOMERManagerEditor.cxx +++ b/EVE/Alieve/AliEveHOMERManagerEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveHOMERManagerEditor.h" diff --git a/EVE/Alieve/AliEveHOMERManagerEditor.h b/EVE/Alieve/AliEveHOMERManagerEditor.h index fc79f94059f..ae627172dbf 100644 --- a/EVE/Alieve/AliEveHOMERManagerEditor.h +++ b/EVE/Alieve/AliEveHOMERManagerEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_AliEVEHOMERManagerEditor_H diff --git a/EVE/Alieve/AliEveHOMERSource.cxx b/EVE/Alieve/AliEveHOMERSource.cxx index 9f89d55435a..12efefa371f 100644 --- a/EVE/Alieve/AliEveHOMERSource.cxx +++ b/EVE/Alieve/AliEveHOMERSource.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveHOMERSource.h" diff --git a/EVE/Alieve/AliEveHOMERSource.h b/EVE/Alieve/AliEveHOMERSource.h index 2952701bbae..7ac003bd9ef 100644 --- a/EVE/Alieve/AliEveHOMERSource.h +++ b/EVE/Alieve/AliEveHOMERSource.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_AliEVEHOMERSource_H diff --git a/EVE/Alieve/AliEveHOMERSourceList.cxx b/EVE/Alieve/AliEveHOMERSourceList.cxx index 0bfbef1591a..306e70de731 100644 --- a/EVE/Alieve/AliEveHOMERSourceList.cxx +++ b/EVE/Alieve/AliEveHOMERSourceList.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveHOMERSourceList.h" diff --git a/EVE/Alieve/AliEveHOMERSourceList.h b/EVE/Alieve/AliEveHOMERSourceList.h index 070d69684c3..fcdb1332b21 100644 --- a/EVE/Alieve/AliEveHOMERSourceList.h +++ b/EVE/Alieve/AliEveHOMERSourceList.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_AliEVEHOMERSourceList_H diff --git a/EVE/Alieve/AliEveITSDigitsInfo.cxx b/EVE/Alieve/AliEveITSDigitsInfo.cxx index 02ecdebaeb4..dbb7ac37fb6 100644 --- a/EVE/Alieve/AliEveITSDigitsInfo.cxx +++ b/EVE/Alieve/AliEveITSDigitsInfo.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include @@ -102,14 +102,14 @@ void AliEveITSDigitsInfo::InitInternals() // spd lowest resolution Int_t nx = 8; // fSegSPD->Npx()/8; // 32 Int_t nz = 6; // fSegSPD->Npz()/2; // 128 - fSPDScaleX[1] = Int_t(nx); - fSPDScaleZ[1] = Int_t(nz); - fSPDScaleX[2] = Int_t(nx*2); - fSPDScaleZ[2] = Int_t(nz*2); - fSPDScaleX[3] = Int_t(nx*3); - fSPDScaleZ[3] = Int_t(nz*3); - fSPDScaleX[4] = Int_t(nx*4); - fSPDScaleZ[4] = Int_t(nz*4); + fSPDScaleX[1] = Int_t(nx); + fSPDScaleZ[1] = Int_t(nz); + fSPDScaleX[2] = Int_t(nx*2); + fSPDScaleZ[2] = Int_t(nz*2); + fSPDScaleX[3] = Int_t(nx*3); + fSPDScaleZ[3] = Int_t(nz*3); + fSPDScaleX[4] = Int_t(nx*4); + fSPDScaleZ[4] = Int_t(nz*4); fSDDScaleX[1] = 2; fSDDScaleZ[1] = 2; @@ -128,7 +128,7 @@ void AliEveITSDigitsInfo::InitInternals() /**************************************************************************/ -AliEveITSDigitsInfo:: ~AliEveITSDigitsInfo() +AliEveITSDigitsInfo:: ~AliEveITSDigitsInfo() { // Destructor. // Deletes the data-maps and the tree. @@ -141,7 +141,7 @@ AliEveITSDigitsInfo:: ~AliEveITSDigitsInfo() for(j = fSSDmap.begin(); j != fSSDmap.end(); ++j) delete j->second; - delete fSegSPD; delete fSegSDD; delete fSegSSD; + delete fSegSPD; delete fSegSDD; delete fSegSSD; delete fGeom; delete fTree; } @@ -169,7 +169,7 @@ void AliEveITSDigitsInfo::ReadRaw(AliRawReader* raw, Int_t mode) Int_t module = inputSPD.GetModuleID(); Int_t column = inputSPD.GetColumn(); Int_t row = inputSPD.GetRow(); - + if (inputSPD.IsNewModule()) { digits = fSPDmap[module]; @@ -260,18 +260,18 @@ void AliEveITSDigitsInfo::SetITSSegmentation() fSPDZCoord[0]=fZ1pitchSPD -fHlSPD; for (m=1; mfType) + switch(sel->GetType()) { case 0: idx0 = 0; @@ -387,7 +387,7 @@ void AliEveITSDigitsInfo::GetModuleIDs(AliEveITSModuleSelection* sel, for (Int_t id = idx0; idGetModuleId(id, lay, lad, det); - if (sel->fLayer == lay || sel->fLayer == -1) + if (sel->GetLayer() == lay || sel->GetLayer() == -1) { // check data from matrix mx.UnitTrans(); @@ -395,11 +395,11 @@ void AliEveITSDigitsInfo::GetModuleIDs(AliEveITSModuleSelection* sel, mx.SetBaseVec(1, x[0], x[3], x[6]); mx.SetBaseVec(2, x[1], x[4], x[7]); mx.SetBaseVec(3, x[2], x[5], x[8]); - fGeom->GetTrans(id, x); + fGeom->GetTrans(id, x); mx.SetBaseVec(4, x); mx.GetPos(v); - if (v.Phi() <= sel->fMaxPhi && v.Phi() >= sel->fMinPhi && - v.Theta() <= sel->fMaxTheta && v.Theta() >= sel->fMinTheta) + if (v.Phi() <= sel->GetMaxPhi() && v.Phi() >= sel->GetMinPhi() && + v.Theta() <= sel->GetMaxTheta() && v.Theta() >= sel->GetMinTheta()) { ids.push_back(id); } @@ -421,7 +421,7 @@ void AliEveITSDigitsInfo::Print(Option_t* ) const printf("SPD dimesion of (%d,%d) in pixel(%f,%f)\n", ix, iz, fSegSPD->Dpx(ix), fSegSPD->Dpz(iz)); iz = 32; printf("SPD dimesion of pixel (%d,%d) are (%f,%f)\n", ix, iz, fSegSPD->Dpx(ix)*0.001, fSegSPD->Dpz(iz)*0.001); - + printf("*********************************************************\n"); printf("SDD module dimension (%f,%f)\n", fSegSDD->Dx()*0.0001, fSegSDD->Dz()*0.0001); printf("SDD first,last module:: %d,%d\n", fGeom->GetStartSDD(), fGeom->GetLastSDD()); @@ -435,9 +435,9 @@ void AliEveITSDigitsInfo::Print(Option_t* ) const printf("SSD strips in module %d\n", fSegSSD->Npx()); printf("SSD strip sizes are (%f,%f)\n", fSegSSD->Dpx(1), fSegSSD->Dpz(1)); fSegSSD->SetLayer(5); fSegSSD->Angles(ap,an); - printf("SSD layer 5 stereoP %f stereoN %f angle\n", ap, an); + printf("SSD layer 5 stereoP %f stereoN %f angle\n", ap, an); fSegSSD->SetLayer(6); fSegSSD->Angles(ap,an); - printf("SSD layer 6 stereoP %f stereoN %f angle\n", ap, an); + printf("SSD layer 6 stereoP %f stereoN %f angle\n", ap, an); } @@ -452,4 +452,4 @@ void AliEveITSDigitsInfo::Print(Option_t* ) const printf("Z::original (%3f) scaled (%3f, %3f) \n", zo, zn-dpz/2, zn+dpz/2); printf("X::original (%3f) scaled (%3f, %3f) \n", xo, xn-dpx/2, xn+dpx/2); printf("%d,%d maped to %d,%d \n", od->GetCoord1(), od->GetCoord2(), i,j ); -*/ +*/ diff --git a/EVE/Alieve/AliEveITSDigitsInfo.h b/EVE/Alieve/AliEveITSDigitsInfo.h index 87b224ba027..ad07d775890 100644 --- a/EVE/Alieve/AliEveITSDigitsInfo.h +++ b/EVE/Alieve/AliEveITSDigitsInfo.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_ITSDigitsInfo_H @@ -39,7 +39,7 @@ protected: Float_t fMaxPhi; // Max phi. Float_t fMinTheta; // Min theta. Float_t fMaxTheta; // Max theta. - + public: AliEveITSModuleSelection(); virtual ~AliEveITSModuleSelection() {} diff --git a/EVE/Alieve/AliEveITSModule.cxx b/EVE/Alieve/AliEveITSModule.cxx index 65dd4262726..1976e4de361 100644 --- a/EVE/Alieve/AliEveITSModule.cxx +++ b/EVE/Alieve/AliEveITSModule.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveITSModule.h" @@ -68,7 +68,7 @@ void AliEveITSModule::InitStatics(AliEveITSDigitsInfo* info) { Float_t dx = info->fSegSPD->Dx()*0.00005; - Float_t dz = 3.50; + Float_t dz = 3.50; fgSPDFrameBox = new TEveFrameBox(); fgSPDFrameBox->SetAAQuadXZ(-dx, 0, -dz, 2*dx, 2*dz); @@ -136,10 +136,10 @@ void AliEveITSModule::SetID(Int_t gid, Bool_t trans) if (!fgStaticInitDone) { InitStatics(fInfo); - + fgSPDFrameBox->IncRefCount(this); fgSPDPalette->IncRefCount(); - + fgSDDFrameBox->IncRefCount(this); fgSDDPalette->IncRefCount(); @@ -152,14 +152,14 @@ void AliEveITSModule::SetID(Int_t gid, Bool_t trans) TString strSensor = "Sensor"; TString symname; Int_t id, nsector, nstave, nladder, rest; - + if (fID <= fInfo->fGeom->GetLastSPD()) { // SPD SetFrame(fgSPDFrameBox); SetPalette(fgSPDPalette); - + symname += strLadder; if (fID < 80) { @@ -180,7 +180,7 @@ void AliEveITSModule::SetID(Int_t gid, Bool_t trans) SetName(symname); fDetID = 0; fDx = fInfo->fSegSPD->Dx()*0.00005; - fDz = 3.50; + fDz = 3.50; fDy = fInfo->fSegSPD->Dy()*0.00005; } @@ -190,7 +190,7 @@ void AliEveITSModule::SetID(Int_t gid, Bool_t trans) SetFrame(fgSDDFrameBox); SetPalette(fgSDDPalette); - + symname += strSensor; if (fID < 324) { @@ -235,14 +235,14 @@ void AliEveITSModule::SetID(Int_t gid, Bool_t trans) symname += rest; SetName(symname); fDetID = 2; - fInfo->fSegSSD->SetLayer(fLayer); + fInfo->fSegSSD->SetLayer(fLayer); fDx = fInfo->fSegSSD->Dx()*0.00005; fDz = fInfo->fSegSSD->Dz()*0.00005; fDy = fInfo->fSegSSD->Dy()*0.00005; } - LoadQuads(); + LoadQuads(); ComputeBBox(); if (trans) SetTrans(); @@ -260,14 +260,14 @@ void AliEveITSModule::LoadQuads() TClonesArray *digits = fInfo->GetDigits(fID, fDetID); Int_t ndigits = digits ? digits->GetEntriesFast() : 0; - Float_t x, z, dpx, dpz; + Float_t x, z, dpx, dpz; Int_t i, j; switch(fDetID) { case 0: { // SPD - AliITSsegmentationSPD* seg = fInfo->fSegSPD; + AliITSsegmentationSPD* seg = fInfo->fSegSPD; Reset(kQT_RectangleXZFixedY, kFALSE, 32); @@ -290,7 +290,7 @@ void AliEveITSModule::LoadQuads() } case 1: { // SDD - AliITSsegmentationSDD *seg = fInfo->fSegSDD; + AliITSsegmentationSDD *seg = fInfo->fSegSDD; Reset(kQT_RectangleXZFixedY, kFALSE, 32); @@ -315,7 +315,7 @@ void AliEveITSModule::LoadQuads() } case 2: { // SSD - AliITSsegmentationSSD* seg = fInfo->fSegSSD; + AliITSsegmentationSSD* seg = fInfo->fSegSSD; Reset(kQT_LineXZFixedY, kFALSE, 32); @@ -368,7 +368,7 @@ void AliEveITSModule::SetTrans() fHMTrans.SetBaseVec(2, x[1], x[4], x[7]); fHMTrans.SetBaseVec(3, x[2], x[5], x[8]); // translation - fInfo->fGeom->GetTrans(fID, x); + fInfo->fGeom->GetTrans(fID, x); fHMTrans.SetBaseVec(4, x); } diff --git a/EVE/Alieve/AliEveITSModule.h b/EVE/Alieve/AliEveITSModule.h index d8f329fc989..3b54dfa65ac 100644 --- a/EVE/Alieve/AliEveITSModule.h +++ b/EVE/Alieve/AliEveITSModule.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_ITSModule_H #define ALIEVE_ITSModule_H @@ -20,7 +20,7 @@ class AliEveITSModule : public TEveQuadSet AliEveITSModule& operator=(const AliEveITSModule&); // Not implemented protected: - AliEveITSDigitsInfo* fInfo; + AliEveITSDigitsInfo* fInfo; Int_t fID; // Module id Int_t fDetID; // Detector id (0~SPD, 1~SDD, 2~SSD) @@ -28,7 +28,7 @@ protected: Int_t fLayer; Int_t fLadder; Int_t fDet; - + Float_t fDx; Float_t fDz; Float_t fDy; @@ -44,7 +44,7 @@ public: AliEveITSDigitsInfo* GetDigitsInfo() const { return fInfo; } void SetDigitsInfo(AliEveITSDigitsInfo* info); - + Int_t GetSubDetID() const { return fDetID; } Int_t GetID() const { return fID; } diff --git a/EVE/Alieve/AliEveITSModuleStepper.cxx b/EVE/Alieve/AliEveITSModuleStepper.cxx index d7df850e8e4..b639fa8647e 100644 --- a/EVE/Alieve/AliEveITSModuleStepper.cxx +++ b/EVE/Alieve/AliEveITSModuleStepper.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveITSModuleStepper.h" @@ -41,8 +41,8 @@ ClassImp(AliEveITSModuleStepper) AliEveITSModuleStepper::AliEveITSModuleStepper(AliEveITSDigitsInfo* di) : TEveElementList("ITS 2DStore", "AliEveITSModuleStepper", kTRUE), - fPosition(0), - + fPosition(0), + fDigitsInfo(di), fScaleInfo(0), @@ -116,7 +116,7 @@ void AliEveITSModuleStepper::Capacity() if (N != GetNChildren()) { DestroyElements(); - for (Int_t m=0; m first_lastpage) first = first_lastpage; if(first < 0) first = 0; @@ -155,12 +155,12 @@ void AliEveITSModuleStepper::Previous() } void AliEveITSModuleStepper::End() -{ +{ Int_t lastpage = fIDs.size()/Nxy(); - if(fIDs.size() % Nxy() ) lastpage++; + if(fIDs.size() % Nxy() ) lastpage++; fPosition = (lastpage -1)*Nxy(); - fStepper->Reset(); + fStepper->Reset(); Apply(); } @@ -171,7 +171,8 @@ void AliEveITSModuleStepper::DisplayDet(Int_t det, Int_t layer) fSubDet = det; fIDs.clear(); AliEveITSModuleSelection sel = AliEveITSModuleSelection(); - sel.fType = det; sel.fLayer=layer; + sel.SetType (det); + sel.SetLayer(layer); fDigitsInfo->GetModuleIDs(&sel, fIDs); //in reder menu define a space between left and right pager fPagerGap = 1.2*TextLength(Form("%d/%d",GetPages(), GetPages())); @@ -184,7 +185,7 @@ void AliEveITSModuleStepper::DisplayTheta(Float_t min, Float_t max) { fIDs.clear(); AliEveITSModuleSelection sel = AliEveITSModuleSelection(); - sel.fMaxTheta = max; sel.fMinTheta=min; + sel.SetThetaRange(min, max); fDigitsInfo->GetModuleIDs(&sel, fIDs); Start(); } @@ -193,7 +194,7 @@ void AliEveITSModuleStepper::DisplayTheta(Float_t min, Float_t max) Int_t AliEveITSModuleStepper::GetCurrentPage() { - Int_t idx = fPosition +1; + Int_t idx = fPosition +1; Int_t n = idx/Nxy(); if(idx % Nxy()) n++; return n; @@ -203,11 +204,11 @@ Int_t AliEveITSModuleStepper::GetCurrentPage() Int_t AliEveITSModuleStepper::GetPages() { - Int_t n = fIDs.size()/Nxy(); - if(fIDs.size() % Nxy()) n++; + Int_t n = fIDs.size()/Nxy(); + if(fIDs.size() % Nxy()) n++; return n; } - + /**************************************************************************/ void AliEveITSModuleStepper::Apply() @@ -219,16 +220,16 @@ void AliEveITSModuleStepper::Apply() UInt_t idx = fPosition; for(List_i childit=fChildren.begin(); childit!=fChildren.end(); ++childit) { - if(idx < fIDs.size()) + if(idx < fIDs.size()) { AliEveITSScaledModule* mod = dynamic_cast(*childit); - mod->SetID(fIDs[idx], kFALSE); + mod->SetID(fIDs[idx], kFALSE); TEveTrans& tr = mod->RefHMTrans(); tr.UnitTrans(); tr.RotateLF(3,2,TMath::PiOver2()); - tr.RotateLF(1,3,TMath::PiOver2()); + tr.RotateLF(1,3,TMath::PiOver2()); - // scaling + // scaling Float_t mz, mx; Float_t* fp = mod->GetFrame()->GetFramePoints(); // switch x,z it will be rotated afterwards @@ -250,7 +251,7 @@ void AliEveITSModuleStepper::Apply() Float_t p[3]; fStepper->GetPosition(p); tr.SetPos(p[0]+0.5*fStepper->GetDx(), p[1]+0.5*fStepper->GetDy(), p[2]+0.5*fStepper->GetDz()); - + if(mod->GetSubDetID() == 2) mod->SetName(Form("SSD %d", idx)); else if(mod->GetSubDetID() == 1) @@ -290,7 +291,7 @@ void AliEveITSModuleStepper::Render(TGLRnrCtx& rnrCtx) gluPickMatrix(rect.X(), rect.Y(), rect.Width(), rect.Height(), (Int_t*) rnrCtx.GetCamera()->RefViewport().CArr()); } - + glMatrixMode(GL_MODELVIEW); glPushMatrix(); glLoadIdentity(); @@ -303,12 +304,12 @@ void AliEveITSModuleStepper::Render(TGLRnrCtx& rnrCtx) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); glDisable(GL_CULL_FACE); glEnable(GL_BLEND); - glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); RenderMenu(); RenderPalette(fPaletteLength, 1.6*fWWidth, fWHeight*0.6); glPopMatrix(); glPopAttrib(); - + if (lightp) glEnable(GL_LIGHTING); glMatrixMode(GL_PROJECTION); @@ -340,13 +341,13 @@ void AliEveITSModuleStepper::RenderString(TString string, Int_t id) if(id > 0) glLoadName(id); if(id>0 && fWActive == id) fText->SetTextColor(fWActiveCol); - else + else fText->SetTextColor(fFontCol); - + if(id>0) - { - if(fWActive == id) + { + if(fWActive == id) fText->SetTextColor(fWActiveCol); else fText->SetTextColor(fFontCol); @@ -359,7 +360,7 @@ void AliEveITSModuleStepper::RenderString(TString string, Int_t id) RenderFrame(bw,fWHeight*2,id); glTranslatef( bw, 0, 0); } - else + else { fText->SetTextColor(fFontCol); fText->PaintGLText(0, txtY, -0.8, string.Data()); @@ -377,7 +378,7 @@ void AliEveITSModuleStepper::RenderFrame(Float_t dx, Float_t dy, Int_t id) UChar_t color[4]; if (fWActive == id) TEveUtil::TEveUtil::ColorFromIdx(fWActiveCol, color); - else + else TEveUtil:: TEveUtil::ColorFromIdx(fWCol, color); glColor4ubv(color); @@ -396,14 +397,14 @@ void AliEveITSModuleStepper::RenderSymbol(Float_t dx, Float_t dy, Int_t id) UChar_t color[4]; if (fWActive == id) TEveUtil::TEveUtil::ColorFromIdx(fWActiveCol, color); - else + else TEveUtil::TEveUtil::ColorFromIdx(fWCol, color); glColor4ubv(color); Float_t xs = dx/4, ys = dy/4; if(id == 0) { glBegin(GL_QUADS); - glVertex2f(0,ys); glVertex2f(0, ys*3); + glVertex2f(0,ys); glVertex2f(0, ys*3); glVertex2f(dx, ys*3); glVertex2f(dx, ys); glEnd(); return; @@ -451,7 +452,7 @@ void AliEveITSModuleStepper::RenderSymbol(Float_t dx, Float_t dy, Int_t id) glVertex2f(xs, ys*1.5); glVertex2f(xs*2, ys*0.5); glVertex2f(xs*3, ys*1.5); break; } - + default: break; } @@ -475,7 +476,7 @@ void AliEveITSModuleStepper::RenderPalette(Float_t dx, Float_t x, Float_t y) { Float_t xs = dx/(p->GetMaxVal() - p->GetMinVal()); Float_t x0 = xs; - for(Int_t i=p->GetMinVal() + 1; iGetMaxVal(); i++) + for(Int_t i=p->GetMinVal() + 1; iGetMaxVal(); i++) { glColor4ubv(p->ColorFromValue(i)); glVertex2f(x0, 0); @@ -511,7 +512,7 @@ void AliEveITSModuleStepper::RenderMenu() Float_t H = 1.9*wh*(1+ 2*fWOff); if(1) { glBegin(GL_QUADS); - glVertex3f(-1, -1, 0.1); glVertex3f(-1, -1+H, 0.1); + glVertex3f(-1, -1, 0.1); glVertex3f(-1, -1+H, 0.1); glVertex3f(1 , -1+H, 0.1); glVertex3f( 1, -1 , 0.1); glEnd(); } @@ -532,7 +533,7 @@ void AliEveITSModuleStepper::RenderMenu() RenderFrame(ww,wh,1); glTranslatef(soff, 0, 0); // text info - { + { const char* txt = Form("%d/%d ", GetCurrentPage(), GetPages()); Float_t dx = (fPagerGap - TextLength(txt))*0.5; fText->SetTextColor(fFontCol); @@ -546,7 +547,7 @@ void AliEveITSModuleStepper::RenderMenu() RenderSymbol(ww, wh, 4); RenderFrame(ww,wh,4); glTranslatef(2*ww, 0, 0); - glPopMatrix(); + glPopMatrix(); // scale info glPushMatrix(); @@ -556,10 +557,10 @@ void AliEveITSModuleStepper::RenderMenu() Int_t cnx = 0, cnz = 0; switch(sm->GetSubDetID()) { - case 0: + case 0: cnx = di->fSPDScaleX[scale], cnz = di->fSPDScaleZ[scale]; break; - case 1: + case 1: cnx = di->fSDDScaleX[scale], cnz = di->fSDDScaleZ[scale]; break; case 2: @@ -584,9 +585,9 @@ void AliEveITSModuleStepper::RenderMenu() glPushMatrix(); glTranslatef(18*ww, 0, 0); Float_t bs = ww*0.2; - RenderString("SPD", 8); + RenderString("SPD", 8); glTranslatef(bs, 0, 0); - RenderString("SDD", 9); + RenderString("SDD", 9); glTranslatef(bs, 0, 0); RenderString("SSD", 10); glPopMatrix(); @@ -604,8 +605,8 @@ void AliEveITSModuleStepper::RenderCellIDs() UInt_t idx = fPosition; for (List_i childit=fChildren.begin(); childit!=fChildren.end(); ++childit) { - if(idx < fIDs.size()) - { + if(idx < fIDs.size()) + { AliEveITSScaledModule* mod = dynamic_cast(*childit); TEveTrans& tr = mod->RefHMTrans(); TString name = Form("%d",mod->GetID()); @@ -636,7 +637,7 @@ Bool_t AliEveITSModuleStepper::Handle(TGLRnrCtx & /*rnrCtx*/, // Return TRUE if event was handled. switch (event->fType) - { + { case kMotionNotify: { Int_t item = rec.GetN() < 2 ? -1 : (Int_t)rec.GetItem(1); @@ -670,9 +671,9 @@ Bool_t AliEveITSModuleStepper::Handle(TGLRnrCtx & /*rnrCtx*/, case 5: { AliEveDigitScaleInfo* si = fScaleInfo; - if(si->GetScale() < 5) + if(si->GetScale() < 5) { - si->ScaleChanged(si->GetScale() + 1); + si->ScaleChanged(si->GetScale() + 1); ElementChanged(kTRUE, kTRUE); } break; @@ -680,9 +681,9 @@ Bool_t AliEveITSModuleStepper::Handle(TGLRnrCtx & /*rnrCtx*/, case 6: { AliEveDigitScaleInfo* si = fScaleInfo; - if(si->GetScale() > 1) + if(si->GetScale() > 1) { - si->ScaleChanged(si->GetScale() - 1); + si->ScaleChanged(si->GetScale() - 1); ElementChanged(kTRUE, kTRUE); } break; @@ -694,10 +695,10 @@ Bool_t AliEveITSModuleStepper::Handle(TGLRnrCtx & /*rnrCtx*/, case 8: DisplayDet(0, -1); break; - case 9: + case 9: DisplayDet(1, -1); break; - case 10: + case 10: DisplayDet(2, -1); break; default: @@ -724,4 +725,4 @@ void AliEveITSModuleStepper::MouseLeave() // Mouse has left the element. fWActive = -1; -} +} diff --git a/EVE/Alieve/AliEveITSModuleStepper.h b/EVE/Alieve/AliEveITSModuleStepper.h index 1e25954dca4..9d5b9c93254 100644 --- a/EVE/Alieve/AliEveITSModuleStepper.h +++ b/EVE/Alieve/AliEveITSModuleStepper.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_ITSModuleStepper_H @@ -59,14 +59,14 @@ protected: // palette configuratiom Float_t fPaletteOffset; - Float_t fPaletteLength; + Float_t fPaletteLength; - // symbol configuration - Int_t fWActive; + // symbol configuration + Int_t fWActive; Float_t fWWidth; Float_t fWHeight; Float_t fWOff; ///offset relative to widget size - Color_t fWCol; + Color_t fWCol; Int_t fWActiveCol; Color_t fFontCol; diff --git a/EVE/Alieve/AliEveITSModuleStepperEditor.cxx b/EVE/Alieve/AliEveITSModuleStepperEditor.cxx index dfea9ba441a..3dadc92f92e 100644 --- a/EVE/Alieve/AliEveITSModuleStepperEditor.cxx +++ b/EVE/Alieve/AliEveITSModuleStepperEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveITSModuleStepperEditor.h" diff --git a/EVE/Alieve/AliEveITSModuleStepperEditor.h b/EVE/Alieve/AliEveITSModuleStepperEditor.h index 3a119e27a68..cab2993a3ff 100644 --- a/EVE/Alieve/AliEveITSModuleStepperEditor.h +++ b/EVE/Alieve/AliEveITSModuleStepperEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_ITSModuleStepperEditor_H @@ -31,7 +31,7 @@ protected: AliEveITSModuleStepper* fM; // fModel dynamic-casted to AliEveITSModuleStepperEditor TEveGridStepperSubEditor* fStepper; - + public: AliEveITSModuleStepperEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); virtual ~AliEveITSModuleStepperEditor(); diff --git a/EVE/Alieve/AliEveITSScaledModule.cxx b/EVE/Alieve/AliEveITSScaledModule.cxx index 4757a860d85..03a08418b14 100644 --- a/EVE/Alieve/AliEveITSScaledModule.cxx +++ b/EVE/Alieve/AliEveITSScaledModule.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveITSScaledModule.h" @@ -29,7 +29,7 @@ AliEveDigitScaleInfo::AliEveDigitScaleInfo(): void AliEveDigitScaleInfo::ScaleChanged(Int_t s) { fScale = s; - + AliEveITSScaledModule* sm; std::list::iterator i = fBackRefs.begin(); while (i != fBackRefs.end()) @@ -44,7 +44,7 @@ void AliEveDigitScaleInfo::StatTypeChanged(Int_t t) { fStatType = t; fSyncPalette = kTRUE; - + AliEveITSScaledModule* sm; std::list::iterator i = fBackRefs.begin(); while (i != fBackRefs.end()) @@ -96,7 +96,7 @@ AliEveITSScaledModule::AliEveITSScaledModule(Int_t gid, AliEveITSDigitsInfo* inf SetOwnIds(kTRUE); SetDigitsInfo(info); - SetID(gid); + SetID(gid); fScaleInfo->IncRefCount(this); } @@ -129,8 +129,8 @@ void AliEveITSScaledModule::LoadQuads() Int_t scale = fScaleInfo->GetScale() -1; switch(fDetID) { - case 0: - { + case 0: + { // SPD Reset(kQT_RectangleXZFixedY, kFALSE, 32); @@ -138,7 +138,7 @@ void AliEveITSScaledModule::LoadQuads() fNCx = fInfo->fSPDScaleX[scale]; fNz = Int_t(fInfo->fSegSPD->Npz()/fNCz); fNx = Int_t(fInfo->fSegSPD->Npx()/fNCx); - dpz = 2*fDz/fNz; + dpz = 2*fDz/fNz; dpx = 2*fDx/fNx; //printf("SPD orig cells (%d, %d) (%d, %d)\n", fInfo->fSegSPD->Npx(), fInfo->fSegSPD->Npz(), Nx, Nz); @@ -152,10 +152,10 @@ void AliEveITSScaledModule::LoadQuads() i = Int_t((zo+fDz)/dpz); j = Int_t((od->GetCoord2()*fNx)/fInfo->fSegSPD->Npx()); id = j*fNx + i; - + miter = dmap.find(id); if(miter == dmap.end()) - { + { dmap[id] = fPlex.Size(); z = dpz*(i) - fDz; x = dpx*(j) - fDx; @@ -163,33 +163,33 @@ void AliEveITSScaledModule::LoadQuads() sd = new ScaledDigit(c1, c2); QuadId(sd); } - else + else { sd = dynamic_cast(GetId(miter->second)); - if(c1 < sd->min_i) + if(c1 < sd->min_i) sd->min_i = c1; else if( c1 > sd->max_i) sd->max_i = c1; - - if(c2 < sd->min_j) + + if(c2 < sd->min_j) sd->min_j = c2; else if( c2 > sd->max_j) sd->max_j = c2; } - + sd->N++; sd->sum += od->GetSignal(); sd->sqr_sum += od->GetSignal()*od->GetSignal(); } break; } - case 1: - { + case 1: + { // SDD Reset(kQT_RectangleXZFixedY, kFALSE, 32); fNCz = fInfo->fSDDScaleZ[scale]; - fNCx = fInfo->fSDDScaleX[scale]; + fNCx = fInfo->fSDDScaleX[scale]; fNz = Int_t(fInfo->fSegSDD->Npz()/fNCz); fNx = Int_t(fInfo->fSegSDD->Npx()/fNCx); dpz = 2*fDz/fNz; @@ -208,10 +208,10 @@ void AliEveITSScaledModule::LoadQuads() id = j*fNx + i; c1 = od->GetCoord1(); c2 = od->GetCoord2(); - + miter = dmap.find(id); if(miter == dmap.end()) - { + { dmap[id] = fPlex.Size(); z = dpz*(i) - fDz; x = dpx*(j) - fDx; @@ -219,15 +219,15 @@ void AliEveITSScaledModule::LoadQuads() sd = new ScaledDigit(od->GetCoord1(),od->GetCoord2()); QuadId(sd); } - else + else { sd = dynamic_cast(GetId(miter->second)); - if(c1 < sd->min_i) + if(c1 < sd->min_i) sd->min_i = c1; else if( c1 > sd->max_i) sd->max_i = c1; - - if(c2 < sd->min_j) + + if(c2 < sd->min_j) sd->min_j = c2; else if( c2 > sd->max_j) sd->max_j = c2; @@ -237,19 +237,19 @@ void AliEveITSScaledModule::LoadQuads() sd->sqr_sum += od->GetSignal()*od->GetSignal(); } break; - } - case 2: - { - // SSD + } + case 2: + { + // SSD Reset(kQT_LineXZFixedY, kFALSE, 32); - AliITSsegmentationSSD* seg = fInfo->fSegSSD; + AliITSsegmentationSSD* seg = fInfo->fSegSSD; Float_t ap, an; // positive/negative angles -> offsets seg->Angles(ap, an); ap = TMath::Tan(ap) * fDz; an = - TMath::Tan(an) * fDz; - fNCx = fInfo->fSSDScale[scale]; + fNCx = fInfo->fSSDScale[scale]; fNz = 1; fNx = Int_t(fInfo->fSegSSD->Npx()/fNCx); dpz = 2*fDz/fNz; @@ -258,18 +258,18 @@ void AliEveITSScaledModule::LoadQuads() AliITSdigitSSD *od=0; for (Int_t k=0; kUncheckedAt(k); - if(od->GetCoord1() == 1) + if(od->GetCoord1() == 1) i = 1; // p side - else + else i= -1; // n side j = Int_t(od->GetCoord2()/fNCx); c1 = od->GetCoord1(); c2 = od->GetCoord2(); - id = j*i; + id = j*i; miter = dmap.find(id); ScaledDigit* sd; if(miter == dmap.end()) - { + { // printf("orig digit %d,%d scaled %d,%d \n",od->GetCoord1(),od->GetCoord2(),i,j); dmap[id] = fPlex.Size(); z = dpz*(i) - fDz; @@ -280,15 +280,15 @@ void AliEveITSScaledModule::LoadQuads() sd = new ScaledDigit(c1, c2); QuadId(sd); } - else + else { - sd = dynamic_cast(GetId(miter->second)); - if(c1 < sd->min_i) + sd = dynamic_cast(GetId(miter->second)); + if(c1 < sd->min_i) sd->min_i = c1; else if( c1 > sd->max_i) sd->max_i = c1; - - if(c2 < sd->min_j) + + if(c2 < sd->min_j) sd->min_j = c2; else if( c2 > sd->max_j) sd->max_j = c2; @@ -311,7 +311,7 @@ void AliEveITSScaledModule::SetQuadValues() { if(fScaleInfo->GetSyncPalette()) SyncPalette(); - Int_t N = fPlex.Size(); + Int_t N = fPlex.Size(); for (Int_t i = 0 ; i< N; i++) { ScaledDigit* sd = dynamic_cast(GetId(i)); @@ -338,14 +338,14 @@ void AliEveITSScaledModule::SetQuadValues() /**************************************************************************/ void AliEveITSScaledModule::SyncPalette() -{ +{ // printf("AliEveITSScaledModule::SyncPalette()\n"); - if(fScaleInfo->GetStatType() == AliEveDigitScaleInfo::ST_Occup) + if(fScaleInfo->GetStatType() == AliEveDigitScaleInfo::ST_Occup) { // SPD AliEveITSModule::fgSPDPalette->SetLimits(0, 100); AliEveITSModule::fgSPDPalette->SetMinMax(0, 100); - + // SDD AliEveITSModule::fgSDDPalette->SetLimits(0, 100); AliEveITSModule::fgSDDPalette->SetMinMax(0, 100); @@ -360,7 +360,7 @@ void AliEveITSScaledModule::SyncPalette() // SPD AliEveITSModule::fgSPDPalette->SetLimits(0, DI.fSPDHighLim); AliEveITSModule::fgSPDPalette->SetMinMax(DI.fSPDMinVal, DI.fSPDMaxVal); - + // SDD AliEveITSModule::fgSDDPalette->SetLimits(0, DI.fSDDHighLim); AliEveITSModule::fgSDDPalette->SetMinMax(DI.fSDDMinVal, DI.fSDDMaxVal); @@ -398,12 +398,12 @@ void AliEveITSScaledModule::DigitSelected(Int_t idx) printf("%d digits in cell scaleX = %d, scaleZ = %d \n", sd->N, fNCx, fNCz); Int_t il = 0; - for(Int_t k=0; kUncheckedAt(k); - if(d->GetCoord1()>=sd->min_i && d->GetCoord1()<=sd->max_i && - d->GetCoord2()>=sd->min_j && d->GetCoord2()<=sd->max_j) + if(d->GetCoord1()>=sd->min_i && d->GetCoord1()<=sd->max_i && + d->GetCoord2()>=sd->min_j && d->GetCoord2()<=sd->max_j) { printf("%3d, %3d: %3d", d->GetCoord1(), d->GetCoord2(), d->GetSignal()); printf(" | "); diff --git a/EVE/Alieve/AliEveITSScaledModule.h b/EVE/Alieve/AliEveITSScaledModule.h index 23740cc6e54..db839728dea 100644 --- a/EVE/Alieve/AliEveITSScaledModule.h +++ b/EVE/Alieve/AliEveITSScaledModule.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_ITSScaledModule_H @@ -31,15 +31,15 @@ private: AliEveDigitScaleInfo& operator=(const AliEveDigitScaleInfo&); // Not implemented protected: - Int_t fScale; + Int_t fScale; Int_t fStatType; - + Bool_t fSyncPalette; public: AliEveDigitScaleInfo(); virtual ~AliEveDigitScaleInfo(){} - + Int_t GetScale() { return fScale; } void ScaleChanged(Int_t s); @@ -67,9 +67,9 @@ public: ScaledDigit(); ScaledDigit(Int_t di, Int_t dj); - + virtual void Dump() const; -}; +}; /**************************************************************************/ // AliEveITSScaledModule @@ -79,13 +79,13 @@ class AliEveITSScaledModule : public AliEveITSModule { friend class ITSSDSubEditor; private: - map fDigitsMap; - + map fDigitsMap; + AliEveITSScaledModule(const AliEveITSScaledModule&); // Not implemented AliEveITSScaledModule& operator=(const AliEveITSScaledModule&); // Not implemented protected: - Int_t fNx; // per module + Int_t fNx; // per module Int_t fNz; Int_t fNCx; // per cell diff --git a/EVE/Alieve/AliEveITSScaledModuleEditor.cxx b/EVE/Alieve/AliEveITSScaledModuleEditor.cxx index 5797e5dd473..88659754e2d 100644 --- a/EVE/Alieve/AliEveITSScaledModuleEditor.cxx +++ b/EVE/Alieve/AliEveITSScaledModuleEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveITSScaledModuleEditor.h" @@ -26,7 +26,7 @@ //______________________________________________________________________ -// AliEveITSScaledModuleEditor +// AliEveITSScaledModuleEditor // ClassImp(AliEveITSScaledModuleEditor) @@ -37,7 +37,7 @@ ClassImp(AliEveITSScaledModuleEditor) fInfoFrame(0), - fModule(0), + fModule(0), fScale(0), fStatistic(0), @@ -57,7 +57,7 @@ ClassImp(AliEveITSScaledModuleEditor) f->AddFrame(fScale, new TGLayoutHints(kLHintsLeft, 1, 7, 1, 1)); fScale->Associate(f); fScale->Connect("ValueSet(Long_t)", "AliEveITSScaledModuleEditor", this, "DoScale()"); - + TGLabel* lab = new TGLabel(f, "Statistic:"); f->AddFrame(lab, new TGLayoutHints(kLHintsLeft|kLHintsBottom, 1, 2, 1, 2)); fStatistic = new TGComboBox(f); @@ -83,13 +83,13 @@ AliEveITSScaledModuleEditor::~AliEveITSScaledModuleEditor() void AliEveITSScaledModuleEditor::CreateInfoFrame() { fInfoFrame = CreateEditorTabSubFrame("Info"); - TGCompositeFrame *title1 = new TGCompositeFrame(fInfoFrame, 145, 10, - kHorizontalFrame | - kLHintsExpandX | - kFixedWidth | + TGCompositeFrame *title1 = new TGCompositeFrame(fInfoFrame, 145, 10, + kHorizontalFrame | + kLHintsExpandX | + kFixedWidth | kOwnBackground); - title1->AddFrame(new TGLabel(title1, "ScaledDigits Info"), + title1->AddFrame(new TGLabel(title1, "ScaledDigits Info"), new TGLayoutHints(kLHintsLeft, 1, 1, 0, 0)); title1->AddFrame(new TGHorizontal3DLine(title1), new TGLayoutHints(kLHintsExpandX, 5, 5, 7, 7)); @@ -113,13 +113,13 @@ void AliEveITSScaledModuleEditor::CreateInfoFrame() void AliEveITSScaledModuleEditor::SetModel(TObject* obj) { - fModule = dynamic_cast(obj); + fModule = dynamic_cast(obj); // widgets fScale->SetIntNumber(fModule->GetScaleInfo()->GetScale()); fStatistic->Select(fModule->GetScaleInfo()->GetStatType(), kFALSE); - // text info + // text info Int_t cnx, cnz, total; fModule->GetScaleData(cnx, cnz, total); fInfoLabel0->SetText(Form("Cell size: Nx=%d Nz=%d", cnx, cnz)); diff --git a/EVE/Alieve/AliEveITSScaledModuleEditor.h b/EVE/Alieve/AliEveITSScaledModuleEditor.h index 969c5d8c1ed..f3149206088 100644 --- a/EVE/Alieve/AliEveITSScaledModuleEditor.h +++ b/EVE/Alieve/AliEveITSScaledModuleEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_ITSScaledModuleEditor_H @@ -42,7 +42,7 @@ protected: AliEveITSScaledModule* fModule; // fModel dynamic-casted to AliEveITSScaledModuleEditor TGNumberEntry* fScale; - TGComboBox* fStatistic; + TGComboBox* fStatistic; TGLabel* fInfoLabel0; TGLabel* fInfoLabel1; diff --git a/EVE/Alieve/AliEveJetPlane.cxx b/EVE/Alieve/AliEveJetPlane.cxx index 4089b713b81..4636bd38a8a 100644 --- a/EVE/Alieve/AliEveJetPlane.cxx +++ b/EVE/Alieve/AliEveJetPlane.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveJetPlane.h" diff --git a/EVE/Alieve/AliEveJetPlane.h b/EVE/Alieve/AliEveJetPlane.h index fab6ffa638d..da55386a242 100644 --- a/EVE/Alieve/AliEveJetPlane.h +++ b/EVE/Alieve/AliEveJetPlane.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_JetPlane_H diff --git a/EVE/Alieve/AliEveJetPlaneEditor.cxx b/EVE/Alieve/AliEveJetPlaneEditor.cxx index 59e64cea94c..3973265be3e 100644 --- a/EVE/Alieve/AliEveJetPlaneEditor.cxx +++ b/EVE/Alieve/AliEveJetPlaneEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveJetPlaneEditor.h" @@ -160,7 +160,7 @@ void AliEveJetPlaneEditor::DoTwoSelection() } void AliEveJetPlaneEditor::DoStaticDataWindow() -{ +{ printf("\n Soon available ... \n"); if (fgStaticWindow == 0) fgStaticWindow = new StaticDataWindow(gClient->GetRoot(), this, 400, 200); diff --git a/EVE/Alieve/AliEveJetPlaneEditor.h b/EVE/Alieve/AliEveJetPlaneEditor.h index c722a04fd87..cf00b4c1808 100644 --- a/EVE/Alieve/AliEveJetPlaneEditor.h +++ b/EVE/Alieve/AliEveJetPlaneEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_JetPlaneEditor_H diff --git a/EVE/Alieve/AliEveJetPlaneGL.cxx b/EVE/Alieve/AliEveJetPlaneGL.cxx index 96d36ef4c2e..aa02813eb02 100644 --- a/EVE/Alieve/AliEveJetPlaneGL.cxx +++ b/EVE/Alieve/AliEveJetPlaneGL.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveJetPlaneGL.h" diff --git a/EVE/Alieve/AliEveJetPlaneGL.h b/EVE/Alieve/AliEveJetPlaneGL.h index d14013750d4..6a2e1d6f835 100644 --- a/EVE/Alieve/AliEveJetPlaneGL.h +++ b/EVE/Alieve/AliEveJetPlaneGL.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_JetPlaneGL_H diff --git a/EVE/Alieve/AliEveKineTools.cxx b/EVE/Alieve/AliEveKineTools.cxx index 275114dbb17..f89b496b90f 100644 --- a/EVE/Alieve/AliEveKineTools.cxx +++ b/EVE/Alieve/AliEveKineTools.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveKineTools.h" @@ -44,16 +44,16 @@ void AliEveKineTools::SetDaughterPathMarks(TEveElement* cont, AliStack* stack, B while(iter != cont->EndChildren()) { - TEveTrack* track = dynamic_cast(*iter); + TEveTrack* track = dynamic_cast(*iter); TParticle* p = stack->Particle(track->GetLabel()); if(p->GetNDaughters()) { Int_t d0 = p->GetDaughter(0), d1 = p->GetDaughter(1); - for(int d=d0; d>0 && d<=d1; ++d) - { + for(int d=d0; d>0 && d<=d1; ++d) + { TParticle* dp = stack->Particle(d); TEvePathMark* pm = new TEvePathMark(TEvePathMark::kDaughter); pm->fV.Set(dp->Vx(), dp->Vy(), dp->Vz()); - pm->fP.Set(dp->Px(), dp->Py(), dp->Pz()); + pm->fP.Set(dp->Px(), dp->Py(), dp->Pz()); pm->fTime = dp->T(); track->AddPathMark(pm); } @@ -77,8 +77,8 @@ void slurp_tracks(map& tracks, TEveElement* cont, Bool_t recu { TEveElement::List_i citer = cont->BeginChildren(); while(citer != cont->EndChildren()) - { - TEveTrack* track = dynamic_cast(*citer); + { + TEveTrack* track = dynamic_cast(*citer); tracks[track->GetLabel()] = track; if (recurse) slurp_tracks(tracks, track, recurse); @@ -97,7 +97,7 @@ void AliEveKineTools::SetTrackReferences(TEveElement* cont, TTree* treeTR, Bool_ // Fill map map tracks; slurp_tracks(tracks, cont, recurse); - + Int_t nPrimaries = (Int_t) treeTR->GetEntries(); TIter next(treeTR->GetListOfBranches()); TBranchElement* el; @@ -110,14 +110,14 @@ void AliEveKineTools::SetTrackReferences(TEveElement* cont, TTree* treeTR, Bool_ TClonesArray* arr = 0; el->SetAddress(&arr); - for (Int_t iPrimPart = 0; iPrimPartGetEntry(iPrimPart); Int_t last_label = -1; - map::iterator iter = tracks.end(); + map::iterator iter = tracks.end(); Int_t Nent = arr->GetEntriesFast(); - for (Int_t iTrackRef = 0; iTrackRef < Nent; iTrackRef++) + for (Int_t iTrackRef = 0; iTrackRef < Nent; iTrackRef++) { AliTrackReference* atr = (AliTrackReference*)arr->UncheckedAt(iTrackRef); @@ -125,7 +125,7 @@ void AliEveKineTools::SetTrackReferences(TEveElement* cont, TTree* treeTR, Bool_ if (label < 0) throw(eH + Form("negative label for entry %d in branch %s.", iTrackRef, el->GetName())); - + if(label != last_label) { iter = tracks.find(label); last_label = label; @@ -134,12 +134,12 @@ void AliEveKineTools::SetTrackReferences(TEveElement* cont, TTree* treeTR, Bool_ if (iter != tracks.end()) { TEvePathMark* pm = new TEvePathMark(isRef ? TEvePathMark::kReference : TEvePathMark::kDecay); pm->fV.Set(atr->X(),atr->Y(), atr->Z()); - pm->fP.Set(atr->Px(),atr->Py(), atr->Pz()); + pm->fP.Set(atr->Px(),atr->Py(), atr->Pz()); pm->fTime = atr->GetTime(); TEveTrack* track = iter->second; track->AddPathMark(pm); } - } // loop track refs + } // loop track refs } // loop primaries, clones arrays delete arr; } // end loop through top branches @@ -153,7 +153,7 @@ void AliEveKineTools::SortPathMarks(TEveElement* cont, Bool_t recurse) map tracks; slurp_tracks(tracks, cont, recurse); - // sort + // sort for(map::iterator j=tracks.begin(); j!=tracks.end(); ++j) { j->second->SortPathMarksByTime(); diff --git a/EVE/Alieve/AliEveKineTools.h b/EVE/Alieve/AliEveKineTools.h index e6cc217320b..6f35fcb4189 100644 --- a/EVE/Alieve/AliEveKineTools.h +++ b/EVE/Alieve/AliEveKineTools.h @@ -4,10 +4,10 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ -// Tools for import of kinematics. +// Tools for import of kinematics. // Preliminary/minimal solution. #ifndef ALIEVE_KineTools_H @@ -33,7 +33,7 @@ protected: public: AliEveKineTools(); virtual ~AliEveKineTools(){} - + // data from TreeTR void SetDaughterPathMarks(TEveElement* cont, AliStack* stack, Bool_t recurse=kFALSE); void SetTrackReferences (TEveElement* cont, TTree* treeTR=0, Bool_t recurse=kFALSE); diff --git a/EVE/Alieve/AliEveMUONChamber.cxx b/EVE/Alieve/AliEveMUONChamber.cxx index 0632a8a53bf..b605b63d90e 100644 --- a/EVE/Alieve/AliEveMUONChamber.cxx +++ b/EVE/Alieve/AliEveMUONChamber.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveMUONChamber.h" @@ -83,7 +83,7 @@ void AliEveMUONChamber::ComputeBBox() #else BBoxInit(); #endif - + fBBox[0] = - 400.0; fBBox[1] = + 400.0; fBBox[2] = - 400.0; @@ -99,7 +99,7 @@ void AliEveMUONChamber::ComputeBBox() for(Int_t i=0; i<6; ++i) { b3[i] = fBBox[i]; } Float_t* b4 = fPointSet2.AssertBBox(); for(Int_t i=0; i<6; ++i) { b4[i] = fBBox[i]; } - + } //______________________________________________________________________ @@ -200,7 +200,7 @@ void AliEveMUONChamber::SetupColor(Int_t val, UChar_t* pixel) const Int_t AliEveMUONChamber::ColorIndex(Int_t val) const { // - // index color + // index color // if(val < fThreshold) val = fThreshold; @@ -259,7 +259,7 @@ void AliEveMUONChamber::SetDataSource(AliEveMUONData* data) //______________________________________________________________________ AliEveMUONChamberData* AliEveMUONChamber::GetChamberData() const { - + return fMUONData ? fMUONData->GetChamberData(fChamberID) : 0; } @@ -274,13 +274,13 @@ void AliEveMUONChamber::UpdateQuads() fPointSet2.Reset(); AliEveMUONChamberData* data = GetChamberData(); - + Float_t *buffer; Float_t x0, y0, z, w, h, clsq; Int_t charge, cathode, nDigits, nClusters, nHits, oldSize, ic1, ic2; Double_t clsX, clsY, clsZ; Float_t hitX, hitY, hitZ; - + if (data != 0) { SetupColorArray(); @@ -288,7 +288,7 @@ void AliEveMUONChamber::UpdateQuads() // digits nDigits = data->GetNDigits(); - + for (Int_t id = 0; id < nDigits; id++) { buffer = data->GetDigitBuffer(id); @@ -300,27 +300,27 @@ void AliEveMUONChamber::UpdateQuads() z = buffer[4]; charge = (Int_t)buffer[5]; cathode = (Int_t)buffer[6]; - + if (charge <= fThreshold) continue; if (cathode == 0) { fQuadSet1.AddQuad(x0, y0, z, w, h); fQuadSet1.QuadColor(ColorIndex(charge)); - + } if (cathode == 1) { fQuadSet2.AddQuad(x0, y0, z, w, h); fQuadSet2.QuadColor(ColorIndex(charge)); - + } } // end digits loop // clusters - + nClusters = data->GetNClusters()/2; // only one cathode plane oldSize = fPointSet1.GrowFor(nClusters); ic1 = ic2 = 0; @@ -331,7 +331,7 @@ void AliEveMUONChamber::UpdateQuads() clsX = (Double_t)buffer[0]; clsY = (Double_t)buffer[1]; clsZ = (Double_t)buffer[2]; - clsq = buffer[3]; + clsq = buffer[3]; cathode = (Int_t)buffer[4]; if (cathode == 0) { diff --git a/EVE/Alieve/AliEveMUONChamber.h b/EVE/Alieve/AliEveMUONChamber.h index 7493d937a3c..e53d6a34065 100644 --- a/EVE/Alieve/AliEveMUONChamber.h +++ b/EVE/Alieve/AliEveMUONChamber.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_MUONChamber_H #define ALIEVE_MUONChamber_H diff --git a/EVE/Alieve/AliEveMUONChamberData.cxx b/EVE/Alieve/AliEveMUONChamberData.cxx index 1f3145559d5..ca299a9075d 100644 --- a/EVE/Alieve/AliEveMUONChamberData.cxx +++ b/EVE/Alieve/AliEveMUONChamberData.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveMUONChamberData.h" @@ -131,30 +131,30 @@ void AliEveMUONChamberData::Init(Int_t chamber) sseg = (AliMpSectorSegmentation*) AliMpSegmentation::Instance()->GetMpSegmentation(detElemId,AliMp::kCath0); sector = sseg->GetSector(); - - position = sector->Position(); + + position = sector->Position(); dimension = sector->Dimensions(); // half length - + locP[0] = position.Px(); locP[1] = position.Py(); locD[0] = dimension.Px() * 2.; locD[1] = dimension.Py() * 2.; - + locP[2] = 0.0; locD[2] = 0.0; - fgTransformer->Local2Global(detElemId, - locP[0], locP[1], locP[2], + fgTransformer->Local2Global(detElemId, + locP[0], locP[1], locP[2], gloP[0], gloP[1], gloP[2]); - + fgTransformer->Local2Global(detElemId, - locD[0], locD[1], locD[2], + locD[0], locD[1], locD[2], gloD[0], gloD[1], gloD[2]); - - fFrameCoord[fNDetElem][0] = gloP[0]; - fFrameCoord[fNDetElem][1] = gloP[1]; - fFrameCoord[fNDetElem][2] = gloD[0]; - fFrameCoord[fNDetElem][3] = gloD[1]; + + fFrameCoord[fNDetElem][0] = gloP[0]; + fFrameCoord[fNDetElem][1] = gloP[1]; + fFrameCoord[fNDetElem][2] = gloD[0]; + fFrameCoord[fNDetElem][3] = gloD[1]; fFrameCoord[fNDetElem][4] = gloP[2]; // Z position fChamberBox[0] = TMath::Min(fChamberBox[0],gloP[0]-gloD[0]); @@ -163,7 +163,7 @@ void AliEveMUONChamberData::Init(Int_t chamber) fChamberBox[3] = TMath::Max(fChamberBox[3],gloP[1]+gloD[1]); fChamberBox[4] = TMath::Min(fChamberBox[4],gloP[2]); fChamberBox[5] = TMath::Max(fChamberBox[5],gloP[2]); - + } else { // if (!fgSegmentation->HasDE(detElemId)) { @@ -188,18 +188,18 @@ void AliEveMUONChamberData::Init(Int_t chamber) locP[2] = 0.0; locD[2] = 0.0; - fgTransformer->Local2Global(detElemId, - locP[0], locP[1], locP[2], + fgTransformer->Local2Global(detElemId, + locP[0], locP[1], locP[2], gloP[0], gloP[1], gloP[2]); - + fgTransformer->Local2Global(detElemId, - locD[0], locD[1], locD[2], + locD[0], locD[1], locD[2], gloD[0], gloD[1], gloD[2]); - - fFrameCoord[fNDetElem][0] = gloP[0]; - fFrameCoord[fNDetElem][1] = gloP[1]; - fFrameCoord[fNDetElem][2] = gloD[0]; - fFrameCoord[fNDetElem][3] = gloD[1]; + + fFrameCoord[fNDetElem][0] = gloP[0]; + fFrameCoord[fNDetElem][1] = gloP[1]; + fFrameCoord[fNDetElem][2] = gloD[0]; + fFrameCoord[fNDetElem][3] = gloD[1]; fFrameCoord[fNDetElem][4] = gloP[2]; // Z position fChamberBox[0] = TMath::Min(fChamberBox[0],gloP[0]); @@ -212,7 +212,7 @@ void AliEveMUONChamberData::Init(Int_t chamber) fChamberBox[3] = TMath::Max(fChamberBox[1],gloD[1]); fChamberBox[4] = TMath::Min(fChamberBox[4],gloP[2]); fChamberBox[5] = TMath::Max(fChamberBox[5],gloP[2]); - + } fNDetElem++; @@ -236,19 +236,19 @@ void AliEveMUONChamberData::RegisterDigit(Int_t detElemId, Int_t cathode, Int_t ->GetMpSegmentation(detElemId,AliMp::GetCathodType(cathode)); AliMpPad pad = vseg->PadByIndices(AliMpIntPair(ix,iy),kTRUE); - + locP[0] = pad.Position().X(); locP[1] = pad.Position().Y(); locD[0] = pad.Dimensions().X(); locD[1] = pad.Dimensions().Y(); - + locP[2] = 0.0; locD[2] = 0.0; - fgTransformer->Local2Global(detElemId, - locP[0], locP[1], locP[2], + fgTransformer->Local2Global(detElemId, + locP[0], locP[1], locP[2], gloP[0], gloP[1], gloP[2]); - + gloD[0] = locD[0]; gloD[1] = locD[1]; gloD[2] = gloP[2]; diff --git a/EVE/Alieve/AliEveMUONChamberData.h b/EVE/Alieve/AliEveMUONChamberData.h index befd3397469..8abd3e4a039 100644 --- a/EVE/Alieve/AliEveMUONChamberData.h +++ b/EVE/Alieve/AliEveMUONChamberData.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_MUONChamberData_H #define ALIEVE_MUONChamberData_H diff --git a/EVE/Alieve/AliEveMUONChamberEditor.cxx b/EVE/Alieve/AliEveMUONChamberEditor.cxx index 535399e0a0f..87790a018f7 100644 --- a/EVE/Alieve/AliEveMUONChamberEditor.cxx +++ b/EVE/Alieve/AliEveMUONChamberEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveMUONChamberEditor.h" diff --git a/EVE/Alieve/AliEveMUONChamberEditor.h b/EVE/Alieve/AliEveMUONChamberEditor.h index 0e2618749b3..09b18efd018 100644 --- a/EVE/Alieve/AliEveMUONChamberEditor.h +++ b/EVE/Alieve/AliEveMUONChamberEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_MUONChamberEditor_H #define ALIEVE_MUONChamberEditor_H @@ -27,7 +27,7 @@ class AliEveMUONChamberEditor : public TGedFrame AliEveMUONChamberEditor(const AliEveMUONChamberEditor&); // Not implemented AliEveMUONChamberEditor& operator=(const AliEveMUONChamberEditor&); // Not implemented - + protected: AliEveMUONChamber* fM; // fModel dynamic-casted to AliEveMUONChamberEditor @@ -40,10 +40,10 @@ class AliEveMUONChamberEditor : public TGedFrame public: AliEveMUONChamberEditor(const TGWindow* p = 0, - Int_t width = 170, Int_t height = 30, - UInt_t options = kChildFrame, + Int_t width = 170, Int_t height = 30, + UInt_t options = kChildFrame, Pixel_t back = GetDefaultFrameBackground()); - + virtual ~AliEveMUONChamberEditor(); virtual void SetModel(TObject* obj); diff --git a/EVE/Alieve/AliEveMUONChamberGL.cxx b/EVE/Alieve/AliEveMUONChamberGL.cxx index 56f306a92e0..8c7a3711860 100644 --- a/EVE/Alieve/AliEveMUONChamberGL.cxx +++ b/EVE/Alieve/AliEveMUONChamberGL.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ /************************************************************************** * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * @@ -72,7 +72,7 @@ Bool_t AliEveMUONChamberGL::SetModel(TObject* obj, const Option_t* /*opt*/) // if(SetModelCheckClass(obj, AliEveMUONChamber::Class())) { - + fChamber = (AliEveMUONChamber*) fExternalObj; fQS1.SetModel(&fChamber->fQuadSet1); fQS2.SetModel(&fChamber->fQuadSet2); @@ -111,14 +111,14 @@ void AliEveMUONChamberGL::DirectDraw(TGLRnrCtx& rnrCtx) const fChamber->UpdateQuads(); fRTS = fChamber->fRTS; } - + Bool_t hasData = (fChamber->GetChamberData() != 0); - + if(hasData) { DrawQuads(rnrCtx); DrawPoints(); - + } DrawChamberFrame(); @@ -168,9 +168,9 @@ void AliEveMUONChamberGL::DrawPoints() const glLineWidth(1.0); glColor3f(1.0,1.0,1.0); - + glBegin(GL_LINES); - + // clusters Int_t clsSize = fChamber->fClusterSize; @@ -178,17 +178,17 @@ void AliEveMUONChamberGL::DrawPoints() const if (clsSize > 1) { for (Int_t i = 0; i < fChamber->fPointSet1.GetN(); i++) { - + fChamber->fPointSet1.GetPoint(i,x,y,z); glVertex3f(x-clsSize,y+clsSize,z); glVertex3f(x+clsSize,y-clsSize,z); - + glVertex3f(x-clsSize,y-clsSize,z); glVertex3f(x+clsSize,y+clsSize,z); - + } - + } // hits @@ -198,21 +198,21 @@ void AliEveMUONChamberGL::DrawPoints() const if (hitSize > 1) { for (Int_t i = 0; i < fChamber->fPointSet2.GetN(); i++) { - + fChamber->fPointSet2.GetPoint(i,x,y,z); - + glVertex3f(x-hitSize,y,z); glVertex3f(x+hitSize,y,z); - + glVertex3f(x,y-hitSize,z); glVertex3f(x,y+hitSize,z); - + } - + } glEnd(); - + } //______________________________________________________________________ @@ -220,7 +220,7 @@ void AliEveMUONChamberGL::DrawChamberFrame() const { // // draw the chamber frame as GL_LINE_LOOP - // + // AliEveMUONChamberData* chamberData = fChamber->GetChamberData(); Int_t nDetElem = chamberData->GetNDetElem(); @@ -234,7 +234,7 @@ void AliEveMUONChamberGL::DrawChamberFrame() const pix[3] = 255; glColor4ubv(pix); - + for (Int_t id = 0; id < nDetElem; id++) { frameCoord = chamberData->GetFrameCoord(id); @@ -246,14 +246,14 @@ void AliEveMUONChamberGL::DrawChamberFrame() const xRad = frameCoord[2]; yRad = frameCoord[3]; z = frameCoord[4]; - + xRad += 0.0; yRad += 0.0; glBegin(GL_LINE_LOOP); glVertex3f(xOrig,yOrig,z); - + Int_t nstep = 100; Float_t dstep = TMath::Pi()/2.0 / (Float_t)nstep; Float_t d; @@ -266,7 +266,7 @@ void AliEveMUONChamberGL::DrawChamberFrame() const glVertex3f(x,y,z); } - + glVertex3f(xOrig,yOrig,z); glEnd(); diff --git a/EVE/Alieve/AliEveMUONChamberGL.h b/EVE/Alieve/AliEveMUONChamberGL.h index 689844ad4a4..93a9c5ca952 100644 --- a/EVE/Alieve/AliEveMUONChamberGL.h +++ b/EVE/Alieve/AliEveMUONChamberGL.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_MUONChamberGL_H #define ALIEVE_MUONChamberGL_H diff --git a/EVE/Alieve/AliEveMUONData.cxx b/EVE/Alieve/AliEveMUONData.cxx index 97da557205e..6568debd347 100644 --- a/EVE/Alieve/AliEveMUONData.cxx +++ b/EVE/Alieve/AliEveMUONData.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // // Sources: @@ -57,7 +57,7 @@ AliEveMUONData::AliEveMUONData() : // // Constructor // - + for (Int_t i = 0; i < 256; i++) { fTrackList[i] = -1; } @@ -124,7 +124,7 @@ AliEveMUONData& AliEveMUONData::operator=(const AliEveMUONData &mdata) //______________________________________________________________________ void AliEveMUONData::CreateChamber(Int_t chamber) { - // + // // create data for the chamber with id=chamber (0 to 13) // @@ -148,8 +148,8 @@ void AliEveMUONData::CreateAllChambers() //______________________________________________________________________ void AliEveMUONData::DropAllChambers() { - // - // release data from all chambers + // + // release data from all chambers // for (Int_t c = 0; c < 14; ++c) { @@ -214,9 +214,9 @@ void AliEveMUONData::LoadRecPoints(TTree* tree) AliMUONVClusterStore *clusterStore = AliMUONVClusterStore::Create(*tree); clusterStore->Clear(); clusterStore->Connect(*tree,kFALSE); - + tree->GetEvent(0); - + AliMUONVCluster *cluster; Int_t detElemId; Double_t clsX, clsY, clsZ, charge; @@ -224,13 +224,13 @@ void AliEveMUONData::LoadRecPoints(TTree* tree) for (Int_t ch = 0; ch < 10; ++ch) { if (fChambers[ch] == 0) continue; - + TIter next(clusterStore->CreateChamberIterator(ch,ch)); - + while ( ( cluster = static_cast(next()) ) ) { detElemId = cluster->GetDetElemId(); - + clsX = cluster->GetX(); clsY = cluster->GetY(); clsZ = cluster->GetZ(); @@ -244,7 +244,7 @@ void AliEveMUONData::LoadRecPoints(TTree* tree) } delete clusterStore; - + } //______________________________________________________________________ @@ -288,7 +288,7 @@ void AliEveMUONData::LoadHits(TTree* tree) //______________________________________________________________________ void AliEveMUONData::LoadDigits(TTree* tree) { - // + // // load digits from the TreeD // @@ -300,15 +300,15 @@ void AliEveMUONData::LoadDigits(TTree* tree) AliMUONVDigit* digit; TIter next(digitStore->CreateIterator()); - + Int_t cathode, detElemId, ix, iy, charge, chamber, adc; - + while ( ( digit = static_cast(next() ) ) ) { cathode = digit->Cathode(); ix = digit->PadX(); iy = digit->PadY(); - detElemId = digit->DetElemId(); + detElemId = digit->DetElemId(); charge = (Int_t)digit->Charge(); adc = digit->ADC(); chamber = detElemId/100 - 1; @@ -318,7 +318,7 @@ void AliEveMUONData::LoadDigits(TTree* tree) fChambers[chamber]->RegisterDigit(detElemId,cathode,ix,iy,adc); } } - + delete digitStore; } @@ -340,14 +340,14 @@ void AliEveMUONData::LoadRaw(TString fileName) fgRawReader = new AliRawReaderDate(fileName); // DATE file } } - + fgRawReader->RewindEvents(); fgRawReader->Reset(); Int_t iEvent = 0; - while (fgRawReader->NextEvent()) + while (fgRawReader->NextEvent()) { - if (iEvent != gEvent->GetEventId()) + if (iEvent != gEvent->GetEventId()) { iEvent++; continue; @@ -360,20 +360,20 @@ void AliEveMUONData::LoadRaw(TString fileName) digitMaker.SetMakeTriggerDigits(kTRUE); AliMUONDigitStoreV1 digitStore; - + digitMaker.Raw2Digits(fgRawReader,&digitStore); AliMUONVDigit* digit; TIter next(digitStore.CreateIterator()); - + Int_t cathode, detElemId, ix, iy, charge, chamber, adc; - + while ( ( digit = static_cast(next() ) ) ) { cathode = digit->Cathode(); ix = digit->PadX(); iy = digit->PadY(); - detElemId = digit->DetElemId(); + detElemId = digit->DetElemId(); charge = (Int_t)digit->Charge(); adc = digit->ADC(); chamber = detElemId/100 - 1; diff --git a/EVE/Alieve/AliEveMUONData.h b/EVE/Alieve/AliEveMUONData.h index 7afeae4a33a..73c9cb872b8 100644 --- a/EVE/Alieve/AliEveMUONData.h +++ b/EVE/Alieve/AliEveMUONData.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_MUONData_H #define ALIEVE_MUONData_H diff --git a/EVE/Alieve/AliEveMUONTrack.cxx b/EVE/Alieve/AliEveMUONTrack.cxx index e5331ee63dc..4b4cfe31fb7 100644 --- a/EVE/Alieve/AliEveMUONTrack.cxx +++ b/EVE/Alieve/AliEveMUONTrack.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveMUONTrack.h" @@ -94,37 +94,37 @@ void AliEveMUONTrack::PrintMCTrackInfo() cout << " MC track parameters at vertex" << endl; cout << " -------------------------------------------------------------------------------------" << endl; cout << " PDG code Vx Vy Vz Px Py Pz " << endl; - + cout << " " << - setw(8) << setprecision(0) << - fPart->GetPdgCode() << " " << - setw(8) << setprecision(3) << - fPart->Vx() << " " << - setw(8) << setprecision(3) << - fPart->Vy() << " " << - setw(8) << setprecision(3) << - fPart->Vz() << " " << - setw(8) << setprecision(3) << - fPart->Px() << " " << - setw(8) << setprecision(3) << - fPart->Py() << " " << - setw(8) << setprecision(4) << - fPart->Pz() << " " << - + setw(8) << setprecision(0) << + fPart->GetPdgCode() << " " << + setw(8) << setprecision(3) << + fPart->Vx() << " " << + setw(8) << setprecision(3) << + fPart->Vy() << " " << + setw(8) << setprecision(3) << + fPart->Vz() << " " << + setw(8) << setprecision(3) << + fPart->Px() << " " << + setw(8) << setprecision(3) << + fPart->Py() << " " << + setw(8) << setprecision(4) << + fPart->Pz() << " " << + endl; - + pt = TMath::Sqrt(fPart->Px()*fPart->Px()+fPart->Py()*fPart->Py()); p = TMath::Sqrt(fPart->Px()*fPart->Px()+fPart->Py()*fPart->Py()+fPart->Pz()*fPart->Pz()); - + cout << endl; - cout << " Pt = " << + cout << " Pt = " << setw(8) << setprecision(3) << pt << " GeV/c" << endl; - - cout << " P = " << + + cout << " P = " << setw(8) << setprecision(4) << p << " GeV/c" << endl; - + } //______________________________________________________________________ @@ -166,7 +166,7 @@ void AliEveMUONTrack::PrintMUONTrackInfo() cout << endl; cout << " Number of clusters " << fTrack->GetNClusters() << endl; } - + trackParamAtCluster = fTrack->GetTrackParamAtCluster(); nparam = trackParamAtCluster->GetEntries(); @@ -179,39 +179,39 @@ void AliEveMUONTrack::PrintMUONTrackInfo() mtp = (AliMUONTrackParam*)trackParamAtCluster->At(i); - cout << - setw(9)<< setprecision(3) << - i << " " << + cout << + setw(9)<< setprecision(3) << + i << " " << - setw(8) << setprecision(3) << - mtp->GetInverseBendingMomentum() << " " << + setw(8) << setprecision(3) << + mtp->GetInverseBendingMomentum() << " " << setw(8) << setprecision(3) << - mtp->GetBendingSlope()*RADDEG << " " << + mtp->GetBendingSlope()*RADDEG << " " << setw(8) << setprecision(3) << - mtp->GetNonBendingSlope()*RADDEG << " " << + mtp->GetNonBendingSlope()*RADDEG << " " << setw(8) << setprecision(4) << - mtp->GetBendingCoor() << " " << + mtp->GetBendingCoor() << " " << setw(8) << setprecision(4) << - mtp->GetNonBendingCoor() << " " << + mtp->GetNonBendingCoor() << " " << setw(10) << setprecision(6) << - mtp->GetZ() << " " << + mtp->GetZ() << " " << setw(8) << setprecision(4) << - mtp->Px() << " " << + mtp->Px() << " " << setw(8) << setprecision(4) << - mtp->Py() << " " << + mtp->Py() << " " << setw(8) << setprecision(4) << - mtp->Pz() << " " << + mtp->Pz() << " " << setw(8) << setprecision(4) << - mtp->P() << " " << + mtp->P() << " " << endl; @@ -232,42 +232,42 @@ void AliEveMUONTrack::PrintMUONTrackInfo() if (zc < 0.001) zc = 0.0; cout << " " << - setw(8) << setprecision(3) << - mtp->GetInverseBendingMomentum() << " " << - setw(8) << setprecision(3) << - mtp->GetBendingSlope()*RADDEG << " " << - + mtp->GetInverseBendingMomentum() << " " << + + setw(8) << setprecision(3) << + mtp->GetBendingSlope()*RADDEG << " " << + setw(8) << setprecision(3) << - mtp->GetNonBendingSlope()*RADDEG << " " << - + mtp->GetNonBendingSlope()*RADDEG << " " << + setw(8) << setprecision(4) << - bc << " " << - + bc << " " << + setw(8) << setprecision(4) << - nbc << " " << - + nbc << " " << + setw(10) << setprecision(6) << - zc << " " << - + zc << " " << + setw(8) << setprecision(4) << - mtp->Px() << " " << - + mtp->Px() << " " << + setw(8) << setprecision(4) << - mtp->Py() << " " << - + mtp->Py() << " " << + setw(8) << setprecision(4) << - mtp->Pz() << " " << - + mtp->Pz() << " " << + setw(8) << setprecision(4) << - mtp->P() << " " << - + mtp->P() << " " << + endl; - + pt = TMath::Sqrt(mtp->Px()*mtp->Px()+mtp->Py()*mtp->Py()); cout << endl; - cout << " Pt = " << + cout << " Pt = " << setw(8) << setprecision(3) << pt << " GeV/c" << endl; @@ -300,51 +300,51 @@ void AliEveMUONTrack::PrintESDTrackInfo() cout << " ESD muon track " << endl; cout << " -----------------------------------------------------------------------------------------------------------" << endl; cout << " InvBendMom BendSlope NonBendSlope BendCoord NonBendCoord Z Px Py Pz" << endl; - - cout << " " << - - setw(8) << setprecision(4) << - mtp->GetInverseBendingMomentum() << " " << - + + cout << " " << + + setw(8) << setprecision(4) << + mtp->GetInverseBendingMomentum() << " " << + setw(8) << setprecision(3) << - mtp->GetBendingSlope()*RADDEG << " " << - + mtp->GetBendingSlope()*RADDEG << " " << + setw(8) << setprecision(3) << - mtp->GetNonBendingSlope()*RADDEG << " " << - + mtp->GetNonBendingSlope()*RADDEG << " " << + setw(8) << setprecision(4) << - mtp->GetBendingCoor() << " " << - + mtp->GetBendingCoor() << " " << + setw(8) << setprecision(4) << - mtp->GetNonBendingCoor() << " " << - + mtp->GetNonBendingCoor() << " " << + setw(10) << setprecision(6) << - mtp->GetZ() << " " << - + mtp->GetZ() << " " << + setw(8) << setprecision(3) << - mtp->Px() << " " << - + mtp->Px() << " " << + setw(8) << setprecision(3) << - mtp->Py() << " " << - + mtp->Py() << " " << + setw(8) << setprecision(3) << - mtp->Pz() << " " << - + mtp->Pz() << " " << + endl; - + pt = TMath::Sqrt(mtp->Px()*mtp->Px()+mtp->Py()*mtp->Py()); - + cout << endl; - cout << " Pt = " << + cout << " Pt = " << setw(8) << setprecision(3) << pt << " GeV/c" << endl; - - cout << " P = " << + + cout << " P = " << setw(8) << setprecision(4) << mtp->P() << " GeV/c" << endl; - + AliESDEvent* esd = AliEveEventManager::AssertESD(); - + Double_t spdVertexX = 0; Double_t spdVertexY = 0; Double_t spdVertexZ = 0; @@ -358,36 +358,36 @@ void AliEveMUONTrack::PrintESDTrackInfo() spdVertexY = spdVertex->GetYv(); spdVertexX = spdVertex->GetXv(); } - + AliESDVertex* esdVertex = (AliESDVertex*) esd->GetPrimaryVertex(); if (esdVertex->GetNContributors()) { esdVertexZ = esdVertex->GetZv(); esdVertexY = esdVertex->GetYv(); esdVertexX = esdVertex->GetXv(); } - + Float_t t0v = esd->GetT0zVertex(); - + cout << endl; cout << endl; - cout << "External vertex SPD: " << + cout << "External vertex SPD: " << setw(3) << spdVertex->GetNContributors() << " " << setw(8) << setprecision(3) << spdVertexX << " " << spdVertexY << " " << spdVertexZ << " " << endl; - cout << "External vertex ESD: " << + cout << "External vertex ESD: " << setw(3) << esdVertex->GetNContributors() << " " << setw(8) << setprecision(3) << esdVertexX << " " << esdVertexY << " " << esdVertexZ << " " << endl; - cout << "External vertex T0: " << + cout << "External vertex T0: " << setw(8) << setprecision(3) << t0v << " " << endl; - + } //______________________________________________________________________ @@ -400,11 +400,11 @@ void AliEveMUONTrack::MUONTrackInfo() if (fIsMCTrack) { PrintMCTrackInfo(); } - + if (fIsMUONTrack || fIsRefTrack) { PrintMUONTrackInfo(); } - + if (fIsESDTrack) { PrintESDTrackInfo(); } @@ -412,7 +412,7 @@ void AliEveMUONTrack::MUONTrackInfo() if (fIsMUONTriggerTrack) { PrintMUONTriggerTrackInfo(); } - + cout << endl; cout << endl; cout << endl; @@ -457,7 +457,7 @@ void AliEveMUONTrack::MUONTriggerInfo() cout << endl; cout << "#########################################################################################################################<<<<<" << endl; cout << endl; - + } } @@ -483,7 +483,7 @@ void AliEveMUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) Float_t xr[28], yr[28], zr[28]; Float_t xrc[28], yrc[28], zrc[28]; char form[1000]; - + TMatrixD smatrix(2,2); TMatrixD sums(2,1); TMatrixD res(2,1); @@ -491,7 +491,7 @@ void AliEveMUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) Float_t xRec, xRec0; Float_t yRec, yRec0; Float_t zRec, zRec0; - + // middle z between the two detector planes of the trigger chambers Float_t zg[4] = { -1603.5, -1620.5, -1703.5, -1720.5 }; @@ -507,29 +507,29 @@ void AliEveMUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) SetName(form); SetLineStyle(1); } - - AliMUONTrackParam *trackParam = mtrack->GetTrackParamAtVertex(); + + AliMUONTrackParam *trackParam = mtrack->GetTrackParamAtVertex(); xRec0 = trackParam->GetNonBendingCoor(); yRec0 = trackParam->GetBendingCoor(); zRec0 = trackParam->GetZ(); - + if (fIsMUONTrack) { SetPoint(fCount,xRec0,yRec0,zRec0); fCount++; } for (Int_t i = 0; i < 28; i++) xr[i]=yr[i]=zr[i]=0.0; - + Int_t nTrackHits = mtrack->GetNClusters(); - + Bool_t hitChamber[14] = {kFALSE}; Int_t iCha; TClonesArray* trackParamAtCluster = mtrack->GetTrackParamAtCluster(); for (Int_t iHit = 0; iHit < nTrackHits; iHit++){ - trackParam = (AliMUONTrackParam*) trackParamAtCluster->At(iHit); - + trackParam = (AliMUONTrackParam*) trackParamAtCluster->At(iHit); + if (iHit == 0) { if (IsMUONTrack()) { pt = TMath::Sqrt(trackParam->Px()*trackParam->Px()+trackParam->Py()*trackParam->Py()); @@ -544,9 +544,9 @@ void AliEveMUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) xRec = trackParam->GetNonBendingCoor(); yRec = trackParam->GetBendingCoor(); zRec = trackParam->GetZ(); - + iCha = AliMUONConstants::ChamberNumber(zRec); - + xr[iHit] = xRec; yr[iHit] = yRec; zr[iHit] = zRec; @@ -671,12 +671,12 @@ void AliEveMUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) fCount++; } } - + if (!fIsMUONTrack) return; Int_t nrc = 0; if (mtrack->GetMatchTrigger() && 1) { - + for (Int_t i = 0; i < nTrackHits; i++) { if (TMath::Abs(zr[i]) > 1000.0) { //printf("TEveHit %d x %f y %f z %f \n",iHit,xr[i],yr[i],zr[i]); @@ -686,9 +686,9 @@ void AliEveMUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) nrc++; } } - + if (nrc < 2) return; - + // fit x-z smatrix.Zero(); sums.Zero(); @@ -706,7 +706,7 @@ void AliEveMUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) res = smatrix.Invert() * sums; ax = res(0,0); bx = res(1,0); - + // fit y-z smatrix.Zero(); sums.Zero(); @@ -724,21 +724,21 @@ void AliEveMUONTrack::MakeMUONTrack(AliMUONTrack *mtrack) res = smatrix.Invert() * sums; ay = res(0,0); by = res(1,0); - + Float_t xtc, ytc, ztc; for (Int_t ii = 0; ii < 4; ii++) { - + ztc = zg[ii]; ytc = ay+by*zg[ii]; xtc = ax+bx*zg[ii]; - + //printf("tc: x %f y %f z %f \n",xtc,ytc,ztc); - + SetPoint(fCount,xtc,ytc,ztc); fCount++; - + } - + } // end match trigger } @@ -803,7 +803,7 @@ void AliEveMUONTrack::MakeESDTrack(AliESDMuonTrack *mtrack) pv[1] = trackParam.Py(); pv[2] = trackParam.Pz(); fP.Set(pv); - + vect[0] = trackParam.GetNonBendingCoor(); vect[1] = trackParam.GetBendingCoor(); vect[2] = trackParam.GetZ(); @@ -868,7 +868,7 @@ void AliEveMUONTrack::MakeMCTrack(TParticle *part) TParticlePDG *ppdg = fPart->GetPDG(1); Int_t charge = (Int_t)(ppdg->Charge()/3.0); - + Double_t zMax = -1750.0; Double_t rMax = 350.0; Double_t r = 0.0; @@ -929,15 +929,15 @@ void AliEveMUONTrack::Propagate(Float_t *xr, Float_t *yr, Float_t *zr, Int_t i1, trackParamAtCluster = fTrack->GetTrackParamAtCluster(); if (IsMUONTrack()) { - trackParam = (AliMUONTrackParam*)trackParamAtCluster->At(i1); + trackParam = (AliMUONTrackParam*)trackParamAtCluster->At(i1); charge = (Int_t)TMath::Sign(1.0,trackParam->GetInverseBendingMomentum()); } if (IsRefTrack()) { trackParam = fTrack->GetTrackParamAtVertex(); charge = (Int_t)TMath::Sign(1.0,trackParam->GetInverseBendingMomentum()); - trackParam = (AliMUONTrackParam*)trackParamAtCluster->At(i1); + trackParam = (AliMUONTrackParam*)trackParamAtCluster->At(i1); } - + vect[0] = xr[i1]; vect[1] = yr[i1]; vect[2] = zr[i1]; @@ -956,13 +956,13 @@ void AliEveMUONTrack::Propagate(Float_t *xr, Float_t *yr, Float_t *zr, Int_t i1, vect[i] = vout[i]; } } - + } //______________________________________________________________________ void AliEveMUONTrack::GetField(Double_t *position, Double_t *field) { - // + // // returns field components at position, for a give field map // @@ -979,7 +979,7 @@ void AliEveMUONTrack::GetField(Double_t *position, Double_t *field) field[0] = field[1] = field[2] = 0.0; return; } - + // force components //b[1] = 0.0; //b[2] = 0.0; @@ -991,7 +991,7 @@ void AliEveMUONTrack::GetField(Double_t *position, Double_t *field) } //______________________________________________________________________ -void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, +void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, Double_t* vect, Double_t* vout) { /// ****************************************************************** @@ -1022,11 +1022,11 @@ void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, Double_t g1, g2, g3, g4, g5, g6, ang2, dxt, dyt, dzt; Double_t est, at, bt, ct, cba; Double_t f1, f2, f3, f4, rho, tet, hnorm, hp, rho1, sint, cost; - + Double_t x; Double_t y; Double_t z; - + Double_t xt; Double_t yt; Double_t zt; @@ -1047,7 +1047,7 @@ void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, const Int_t kipx = 3; const Int_t kipy = 4; const Int_t kipz = 5; - + // *. // *. ------------------------------------------------------------------ // *. @@ -1063,7 +1063,7 @@ void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, Double_t h = step; Double_t rest; - + do { rest = step - tl; if (TMath::Abs(h) > TMath::Abs(rest)) h = rest; @@ -1107,7 +1107,7 @@ void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, h *= khalf; continue; } - + xyzt[0] = xt; xyzt[1] = yt; xyzt[2] = zt; @@ -1144,7 +1144,7 @@ void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, h *= khalf; continue; } - + xyzt[0] = xt; xyzt[1] = yt; xyzt[2] = zt; @@ -1178,7 +1178,7 @@ void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, if (iter++ > maxit) break; tl += h; - if (est < kdlt32) + if (est < kdlt32) h *= 2.; cba = 1./ TMath::Sqrt(a*a + b*b + c*c); vout[0] = x; @@ -1201,7 +1201,7 @@ void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, f4 = TMath::Sqrt(f1*f1+f2*f2+f3*f3); rho = -f4*pinv; tet = rho * step; - + hnorm = 1./f4; f1 = f1*hnorm; f2 = f2*hnorm; @@ -1210,7 +1210,7 @@ void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, hxp[0] = f2*vect[kipz] - f3*vect[kipy]; hxp[1] = f3*vect[kipx] - f1*vect[kipz]; hxp[2] = f1*vect[kipy] - f2*vect[kipx]; - + hp = f1*vect[kipx] + f2*vect[kipy] + f3*vect[kipz]; rho1 = 1./rho; @@ -1223,11 +1223,11 @@ void AliEveMUONTrack::OneStepRungekutta(Double_t charge, Double_t step, g4 = -cost; g5 = sint; g6 = cost * hp; - + vout[kix] = vect[kix] + g1*vect[kipx] + g2*hxp[0] + g3*f1; vout[kiy] = vect[kiy] + g1*vect[kipy] + g2*hxp[1] + g3*f2; vout[kiz] = vect[kiz] + g1*vect[kipz] + g2*hxp[2] + g3*f3; - + vout[kipx] = vect[kipx] + g4*vect[kipx] + g5*hxp[0] + g6*f1; vout[kipy] = vect[kipy] + g4*vect[kipy] + g5*hxp[1] + g6*f2; vout[kipz] = vect[kipz] + g4*vect[kipz] + g5*hxp[2] + g6*f3; diff --git a/EVE/Alieve/AliEveMUONTrack.h b/EVE/Alieve/AliEveMUONTrack.h index c882d140643..4d09a86303f 100644 --- a/EVE/Alieve/AliEveMUONTrack.h +++ b/EVE/Alieve/AliEveMUONTrack.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_MUONTrack_H #define ALIEVE_MUONTrack_H @@ -43,7 +43,7 @@ class AliEveMUONTrack: public TEveTrack void MakeRefTrack(AliMUONTrack *mtrack); void GetField(Double_t *position, Double_t *field); void Propagate(Float_t *xr, Float_t *yr, Float_t *zr, Int_t i1, Int_t i2); - void OneStepRungekutta(Double_t charge, Double_t step, + void OneStepRungekutta(Double_t charge, Double_t step, Double_t* vect, Double_t* vout); Int_t ColorIndex(Float_t val); diff --git a/EVE/Alieve/AliEvePMDModule.cxx b/EVE/Alieve/AliEvePMDModule.cxx index 0f7c8523bf5..b3ddaf7a327 100644 --- a/EVE/Alieve/AliEvePMDModule.cxx +++ b/EVE/Alieve/AliEvePMDModule.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEvePMDModule.h" @@ -46,7 +46,7 @@ void AliEvePMDModule::DisplayInit(Int_t ism) { TString smodule = "Module"; smodule+= ism; - + Float_t xism =0, yism = 0; Float_t dxism =0, dyism = 0; @@ -77,21 +77,21 @@ void AliEvePMDModule::DisplayDigitsData(Int_t ism, TTree *pmdt) Int_t xpad = 0, ypad = 0; Float_t xpos, ypos; - TClonesArray *digits = new TClonesArray("AliPMDdigit", 0); + TClonesArray *digits = new TClonesArray("AliPMDdigit", 0); TBranch *branch = pmdt->GetBranch("PMDDigit"); branch->SetAddress(&digits); AliPMDdigit *pmddigit; - branch->GetEntry(ism); + branch->GetEntry(ism); Int_t nentries = digits->GetLast(); //printf("%d\n", nentries); for (Int_t ient = 0; ient < nentries+1; ient++) { pmddigit = (AliPMDdigit*)digits->UncheckedAt(ient); - + det = pmddigit->GetDetector(); smn = pmddigit->GetSMNumber(); irow = pmddigit->GetRow(); @@ -108,13 +108,13 @@ void AliEvePMDModule::DisplayDigitsData(Int_t ism, TTree *pmdt) xpad = irow; ypad = icol; } - + RectGeomCellPos(smn, xpad, ypad, xpos, ypos); AddHexagon(xpos, ypos, fgkZpos, fgkRad); - + QuadValue(adc); - + QuadId(new AliPMDdigit(*pmddigit)); // new TNamed(Form("Quad with idx=%d", ient), // "This title is not confusing.")); @@ -161,7 +161,7 @@ void AliEvePMDModule::DisplayRawData(Int_t ism, TObjArray *ddlcont) for (Int_t ient = 0; ient < nentries; ient++) { AliPMDddldata *pmdddl = (AliPMDddldata*)ddlcont->UncheckedAt(ient); - + det = pmdddl->GetDetector(); smn = pmdddl->GetSMN(); if (smn != ism) continue; @@ -179,13 +179,13 @@ void AliEvePMDModule::DisplayRawData(Int_t ism, TObjArray *ddlcont) xpad = irow; ypad = icol; } - + RectGeomCellPos(smn, xpad, ypad, xpos, ypos); AddHexagon(xpos, ypos, fgkZpos, fgkRad); - + QuadValue(adc); - + QuadId(new AliPMDddldata(*pmdddl)); //new TNamed(Form("Quad with idx=%d", ient), // "This title is not confusing.")); @@ -210,7 +210,7 @@ void AliEvePMDModule::DisplayRawData(Int_t ism, TObjArray *ddlcont) RefitPlex(); fHMTrans.SetPos(fX, fY, fZ); - + } // -------------------------------------------------------------------- // @@ -218,7 +218,7 @@ void AliEvePMDModule::DisplayRawData(Int_t ism, TObjArray *ddlcont) void AliEvePMDModule::RectGeomCellPos(Int_t ism, Int_t xpad, Int_t ypad, Float_t &xpos, Float_t &ypos) { - // This routine finds the cell eta,phi for the new PMD rectangular + // This routine finds the cell eta,phi for the new PMD rectangular // geometry in ALICE // Authors : Bedanga Mohanty and Dipak Mishra - 29.4.2003 // modified by B. K. Nandi for change of coordinate sys @@ -230,7 +230,7 @@ void AliEvePMDModule::RectGeomCellPos(Int_t ism, Int_t xpad, Int_t ypad, // // ism : Serial module number from 0 to 23 for each plane - + // Corner positions (x,y) of the 24 unit moudles in ALICE PMD const Double_t kXcorner[24] = @@ -247,7 +247,7 @@ void AliEvePMDModule::RectGeomCellPos(Int_t ism, Int_t xpad, Int_t ypad, -8.9165, 33.7471, //Type-BR }; - + const Double_t kYcorner[24] = { 86.225, 86.225, 86.225, //Type-A @@ -262,10 +262,10 @@ void AliEvePMDModule::RectGeomCellPos(Int_t ism, Int_t xpad, Int_t ypad, -35.925, -35.925 //Type-BR }; - + // const Float_t kSqroot3 = 1.732050808; // sqrt(3.); // const Float_t kCellRadius = 0.25; - + // //Every even row of cells is shifted and placed //in geant so this condition @@ -325,7 +325,7 @@ void AliEvePMDModule::GenerateBox(Int_t ism, Float_t &xism, Float_t &yism, -8.9165, 33.7471, //Type-BR }; - + const Double_t kYcorner[24] = { 86.225, 86.225, 86.225, //Type-A @@ -372,7 +372,7 @@ void AliEvePMDModule::GenerateBox(Int_t ism, Float_t &xism, Float_t &yism, dxism = fgkRad*fgkSqRoot3*96.; dyism = kDia*48. + fgkRad; } - + } // -------------------------------------------------------------------- // diff --git a/EVE/Alieve/AliEvePMDModule.h b/EVE/Alieve/AliEvePMDModule.h index 06ce2bac9cc..331761e317c 100644 --- a/EVE/Alieve/AliEvePMDModule.h +++ b/EVE/Alieve/AliEvePMDModule.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_PMDModule_H diff --git a/EVE/Alieve/AliEvePMDModuleEditor.cxx b/EVE/Alieve/AliEvePMDModuleEditor.cxx index 6336b51003d..6ac1ed78f8d 100644 --- a/EVE/Alieve/AliEvePMDModuleEditor.cxx +++ b/EVE/Alieve/AliEvePMDModuleEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEvePMDModuleEditor.h" @@ -57,13 +57,13 @@ void AliEvePMDModuleEditor::CreateInfoFrame() { fInfoFrame = CreateEditorTabSubFrame("Info"); - TGCompositeFrame *title1 = new TGCompositeFrame(fInfoFrame, 145, 10, - kHorizontalFrame | - kLHintsExpandX | - kFixedWidth | + TGCompositeFrame *title1 = new TGCompositeFrame(fInfoFrame, 145, 10, + kHorizontalFrame | + kLHintsExpandX | + kFixedWidth | kOwnBackground); - title1->AddFrame(new TGLabel(title1, "AliEvePMDModule Info"), + title1->AddFrame(new TGLabel(title1, "AliEvePMDModule Info"), new TGLayoutHints(kLHintsLeft, 1, 1, 0, 0)); title1->AddFrame(new TGHorizontal3DLine(title1), new TGLayoutHints(kLHintsExpandX, 5, 5, 7, 7)); diff --git a/EVE/Alieve/AliEvePMDModuleEditor.h b/EVE/Alieve/AliEvePMDModuleEditor.h index 6c4ae432013..8cbdb430316 100644 --- a/EVE/Alieve/AliEvePMDModuleEditor.h +++ b/EVE/Alieve/AliEvePMDModuleEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_PMDModuleEditor_H diff --git a/EVE/Alieve/AliEveT0Module.cxx b/EVE/Alieve/AliEveT0Module.cxx index 0d07551e3d3..a5b6b0bc98c 100644 --- a/EVE/Alieve/AliEveT0Module.cxx +++ b/EVE/Alieve/AliEveT0Module.cxx @@ -4,14 +4,14 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ ////////////////////////////////////////////////////////////////////////// // // // The main AliEVE drawing module for the T0 detector // // // ////////////////////////////////////////////////////////////////////////// - + #include "AliEveEventManager.h" #include "AliEveT0Module.h" #include @@ -26,7 +26,7 @@ #include #include "AliT0RawReader.h" #include -#include +#include @@ -39,7 +39,7 @@ AliEveT0Module::AliEveT0Module(const Text_t* n, Int_t sigType, AliT0digit *digit // // Default constructor // - + } /**************************************************************************/ @@ -56,7 +56,7 @@ void AliEveT0Module::LoadRaw(TString fileName, Int_t ievt) reader->RequireHeader(kTRUE); AliT0RawReader *start = new AliT0RawReader(reader); Int_t allData[110][5]; - TRandom r(0); + TRandom r(0); // cout<SetLimits(1, 3000); // Set proper raw time range. @@ -64,11 +64,11 @@ void AliEveT0Module::LoadRaw(TString fileName, Int_t ievt) raw_a->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32); TEveQuadSet* raw_c = new AliEveT0Module("T0_RAW_C", 3,digits, start); raw_c->SetPalette(rawPalette); raw_c->Reset(TEveQuadSet::kQT_HexagonXY, kFALSE, 32); - Float_t angle = 2 * TMath::Pi() / 12; + Float_t angle = 2 * TMath::Pi() / 12; start->Next(); for (Int_t i=0; i<110; i++) { - for (Int_t iHit=0; iHit<5; iHit++) + for (Int_t iHit=0; iHit<5; iHit++) { allData[i][iHit]= start->GetData(i,iHit); if (allData[i][iHit] != 0) cout<<"event"<RefitPlex(); raw_c->RefitPlex(); - + TEveTrans& ta_a = raw_a->RefHMTrans(); ta_a.SetPos(0, 0, 373); TEveTrans& tc_c = raw_c->RefHMTrans(); @@ -101,10 +101,10 @@ void AliEveT0Module::LoadRaw(TString fileName, Int_t ievt) /**************************************************************************/ void AliEveT0Module::MakeModules(AliT0digit *digits) { - TRandom r(0); + TRandom r(0); TArrayI ADC(24); TArrayI TDC(24); - + digits->GetQT1(ADC); digits->GetTimeCFD(TDC); // printf("%3d\n",besttimeright); @@ -142,7 +142,7 @@ void AliEveT0Module::MakeModules(AliT0digit *digits) qat->AddHexagon(x, y, r.Uniform(-0.1, 0.1), 1.0); qat->QuadValue(TDC[i+12]); // qat->QuadId(new TNamed(Form("Quad with idx=%d", i), "PMT's time in side A.")); - + qc->AddHexagon(x, y, r.Uniform(-0.1, 0.1), 1.0); qc->QuadValue(ADC[i]); // qc->QuadId(new TNamed(Form("Quad with idx=%d", i), "PMT's amplitude in side C.")); @@ -161,12 +161,12 @@ void AliEveT0Module::MakeModules(AliT0digit *digits) ta.SetPos(0, 0, 373); TEveTrans& tc = qc->RefHMTrans(); tc.SetPos(0, 0, -69.7); - + TEveTrans& tat = qat->RefHMTrans(); tat.SetPos(0, 0, 373); TEveTrans& tct = qct->RefHMTrans(); tct.SetPos(0, 0, -69.7); - + gEve->AddElement(qa); gEve->AddElement(qc); gEve->AddElement(qat); @@ -198,10 +198,10 @@ void AliEveT0Module::DigitSelected(Int_t idx) printf(" idx=%d, amplitude=%d\n", idx, qb->fValue); - } + } if (fSigType == 1) { printf("tdc====================\n"); - + Int_t besttimeright = fDigits->BestTimeA(); Int_t besttimeleft = fDigits->BestTimeC(); Int_t meantime = fDigits->MeanTime(); @@ -222,7 +222,7 @@ void AliEveT0Module::DigitSelected(Int_t idx) printf("besttimeC=%3d\n",fStart->GetData(52,0)-fStart->GetData(0,0)); printf("meantime=%3d\n",fStart->GetData(49,0)-fStart->GetData(0,0)); printf("amplitude= %3d\n",fStart->GetData(idx+1,0)); - + printf(" idx=%d, time %d\n", idx, qb->fValue); } if (fSigType == 3) { @@ -231,7 +231,7 @@ void AliEveT0Module::DigitSelected(Int_t idx) printf("besttimeC=%3d\n",fStart->GetData(52,0)-fStart->GetData(0,0)); printf("meantime=%3d\n",fStart->GetData(49,0)-fStart->GetData(0,0)); printf("amplitude= %3d\n",fStart->GetData(idx+13,0)); - + printf(" idx=%d, time %d\n", idx, qb->fValue); } diff --git a/EVE/Alieve/AliEveT0Module.h b/EVE/Alieve/AliEveT0Module.h index 998dcb3d87e..347a376c5c2 100644 --- a/EVE/Alieve/AliEveT0Module.h +++ b/EVE/Alieve/AliEveT0Module.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_T0Module_H #define ALIEVE_T0Module_H @@ -20,15 +20,15 @@ #include #include - + class AliEveT0Module : public TEveQuadSet { - + AliEveT0Module(const AliEveT0Module&); AliEveT0Module& operator=(const AliEveT0Module&); public: - + AliEveT0Module(const Text_t* n="AliEveT0Module", Int_t sigType=0, AliT0digit *digits=0,AliT0RawReader *start=0); virtual ~AliEveT0Module(); @@ -43,7 +43,7 @@ protected: AliT0digit *fDigits; AliT0RawReader *fStart; - ClassDef(AliEveT0Module,1); + ClassDef(AliEveT0Module,1); }; /* diff --git a/EVE/Alieve/AliEveTOFDigitsInfo.cxx b/EVE/Alieve/AliEveTOFDigitsInfo.cxx index 3ffecc478f2..e71f0cbfa3c 100644 --- a/EVE/Alieve/AliEveTOFDigitsInfo.cxx +++ b/EVE/Alieve/AliEveTOFDigitsInfo.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // // AliEveTOFDigitsInfo @@ -23,7 +23,7 @@ using namespace std; ClassImp(AliEveTOFDigitsInfo) - AliEveTOFDigitsInfo::AliEveTOFDigitsInfo(): + AliEveTOFDigitsInfo::AliEveTOFDigitsInfo(): TObject(), TEveRefCnt(), fTree (0), @@ -33,7 +33,7 @@ ClassImp(AliEveTOFDigitsInfo) {} /* ******************************************************* */ -AliEveTOFDigitsInfo:: ~AliEveTOFDigitsInfo() +AliEveTOFDigitsInfo:: ~AliEveTOFDigitsInfo() { delete fGeom; @@ -47,11 +47,11 @@ AliEveTOFDigitsInfo:: ~AliEveTOFDigitsInfo() void AliEveTOFDigitsInfo::SetTree(TTree* tree) { static const TEveException eH("AliEveTOFDigitsInfo::SetTree "); - + if(fGeom == 0) { fGeom = new AliTOFGeometry(); } - + fTree = tree; /* DecRefCount(); @@ -74,7 +74,7 @@ void AliEveTOFDigitsInfo::LoadDigits() for (Int_t digitNumber=0; digitNumberGetEntries(); digitNumber++) { //if (digitNumber==digitsTOF->GetEntries()-1) printf(" Hello 4 -> %3i digit of %i \n", digitNumber+1, digitsTOF->GetEntries()); - + digs = (AliTOFdigit*)digitsTOF->UncheckedAt(digitNumber); vol[0] = digs->GetSector(); // Sector Number (0-17) @@ -186,15 +186,15 @@ TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector) //Int_t nSector = 1; Int_t vol[5] = {nSector,-1,-1,-1,-1}; - + for(Int_t iPlate=0; iPlateNPlates(); iPlate++){ vol[1] = iPlate; if(iPlate==2) nStrips=15; else nStrips=19; - + for(Int_t iStrip=0; iStripNpadZ(); iPadZ++){ vol[4] = iPadZ; @@ -222,7 +222,7 @@ TClonesArray* AliEveTOFDigitsInfo::GetDigits(Int_t nSector) for (Int_t ii=0; ii<4; ii++) informations[ii]=-1; for (Int_t ii=0; ii<3; ii++) dummy[ii]=-1; for (Int_t ii=0; ii<3; ii++) nDigitsInVolume[ii]=-1; - + } } } diff --git a/EVE/Alieve/AliEveTOFDigitsInfo.h b/EVE/Alieve/AliEveTOFDigitsInfo.h index 2d32be59cd2..71689822653 100644 --- a/EVE/Alieve/AliEveTOFDigitsInfo.h +++ b/EVE/Alieve/AliEveTOFDigitsInfo.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TOFDigitsInfo_H #define ALIEVE_TOFDigitsInfo_H @@ -21,12 +21,12 @@ #include #include - + class AliEveTOFDigitsInfo : public TObject, public TEveRefCnt { AliEveTOFDigitsInfo(const AliEveTOFDigitsInfo&); // Not implemented AliEveTOFDigitsInfo& operator=(const AliEveTOFDigitsInfo&); // Not implemented - + private: protected: @@ -41,7 +41,7 @@ class AliEveTOFDigitsInfo : public TObject, public TEveRefCnt AliEveTOFDigitsInfo(); virtual ~AliEveTOFDigitsInfo(); - + void SetTree(TTree* tree); void LoadDigits(); @@ -52,8 +52,8 @@ class AliEveTOFDigitsInfo : public TObject, public TEveRefCnt TClonesArray* GetDigits(Int_t nSector, Int_t nPlate, Int_t nStrip); TClonesArray* GetDigits(Int_t nSector); void GetDigits(); - + ClassDef(AliEveTOFDigitsInfo, 1); }; // endclass AliEveTOFDigitsInfo - + #endif diff --git a/EVE/Alieve/AliEveTOFDigitsInfoEditor.cxx b/EVE/Alieve/AliEveTOFDigitsInfoEditor.cxx index 042190bb67d..a92f75294c9 100644 --- a/EVE/Alieve/AliEveTOFDigitsInfoEditor.cxx +++ b/EVE/Alieve/AliEveTOFDigitsInfoEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTOFDigitsInfoEditor.h" diff --git a/EVE/Alieve/AliEveTOFDigitsInfoEditor.h b/EVE/Alieve/AliEveTOFDigitsInfoEditor.h index d4e79fc7b77..42fb75545a9 100644 --- a/EVE/Alieve/AliEveTOFDigitsInfoEditor.h +++ b/EVE/Alieve/AliEveTOFDigitsInfoEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TOFDigitsInfoEditor_H diff --git a/EVE/Alieve/AliEveTOFSector.cxx b/EVE/Alieve/AliEveTOFSector.cxx index 8d847118a96..30f08540efe 100644 --- a/EVE/Alieve/AliEveTOFSector.cxx +++ b/EVE/Alieve/AliEveTOFSector.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTOFSector.h" @@ -170,7 +170,7 @@ void AliEveTOFSector::InitStatics() //fgTOFsectorPalette = new TEveRGBAPalette(0, 2048); // TOT fgTOFsectorPalette = new TEveRGBAPalette(0, 8192/*1024*/); // TDC - fgTOFsectorPalette->SetLimits(0, 8192); + fgTOFsectorPalette->SetLimits(0, 8192); fgStaticInitDone = kTRUE; } @@ -190,7 +190,7 @@ void AliEveTOFSector::InitModule() //fFrame = fgTOFsectorFrameBox; //fPalette = fgTOFsectorPalette; - LoadQuads(); + LoadQuads(); ComputeBBox(); SetTrans(); @@ -230,7 +230,7 @@ void AliEveTOFSector::LoadQuads() for (Int_t digitNumber=0; digitNumberGetEntries(); digitNumber++) { //if (digitNumber==digitsTOF->GetEntries()-1) printf(" Hello 4 -> %3i digit of %i \n", digitNumber+1, digitsTOF->GetEntries()); - + digs = (AliTOFdigit*)digitsTOFnew->UncheckedAt(digitNumber); if (digs->GetSector()!=fSectorID) continue; @@ -253,7 +253,7 @@ void AliEveTOFSector::LoadQuads() for (Int_t ii=0; iiGetEntries(); ii++) { tofDigit = (AliTOFdigit*)fTOFarray->UncheckedAt(ii); - + if (fPlateFlag[tofDigit->GetPlate()]) { vol[1] = tofDigit->GetPlate(); @@ -282,7 +282,7 @@ void AliEveTOFSector::LoadQuads() (Float_t)coord[1][0], (Float_t)coord[1][1], (Float_t)coord[1][2], (Float_t)coord[2][0], (Float_t)coord[2][1], (Float_t)coord[2][2], (Float_t)coord[3][0], (Float_t)coord[3][1], (Float_t)coord[3][2]}; - + AddQuad(vertices); //AddQuad((Float_t*)coord); //AddQuad(coord[0], coord[1], coord[2], 2.5, 3.5); @@ -293,7 +293,7 @@ void AliEveTOFSector::LoadQuads() //QuadValue((Int_t)tot); QuadValue((Int_t)tdc); QuadId(tofDigit); - + //} } // closed if control on plates switched on } // closed loop on TOF sector digits @@ -301,7 +301,7 @@ void AliEveTOFSector::LoadQuads() RefitPlex(); fTOFarray = 0x0; - + } /* ************************************************************ */ diff --git a/EVE/Alieve/AliEveTOFSector.h b/EVE/Alieve/AliEveTOFSector.h index 9210edd0a6c..883edab3af3 100644 --- a/EVE/Alieve/AliEveTOFSector.h +++ b/EVE/Alieve/AliEveTOFSector.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TOFSector_H #define ALIEVE_TOFSector_H @@ -21,40 +21,40 @@ #include - + class AliEveTOFSector : public TEveQuadSet - + { AliEveTOFSector(const AliEveTOFSector&); // Not implemented AliEveTOFSector& operator=(const AliEveTOFSector&); // Not implemented - + //Int_t fSectorID; private: void LoadQuads(); - + protected: - + AliTOFGeometry *fTOFgeometry; - + TClonesArray *fTOFarray; TTree *fTOFtree; - + Int_t fSector; //Int_t fPlate; //Int_t fStrip; - + Float_t fDx; Float_t fDy; Float_t fDz; /////////////////////////////// - Bool_t fAutoTrans; - Int_t fMinTime; + Bool_t fAutoTrans; + Int_t fMinTime; Int_t fMaxTime; Short_t fThreshold; Int_t fMaxVal; - Int_t fSectorID; + Int_t fSectorID; Bool_t *fPlateFlag; Bool_t fPlateFlag0; @@ -62,26 +62,26 @@ Bool_t fPlateFlag2; Bool_t fPlateFlag3; Bool_t fPlateFlag4; - + Color_t fFrameColor; Bool_t fRnrFrame; - + TGeoManager *fGeoManager; - - public: + + public: // Bool_t fAutoTrans; - + virtual void InitModule(); - virtual void SetTrans(); + virtual void SetTrans(); AliEveTOFSector(const Text_t* n="AliEveTOFSector", const Text_t* t=0); AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector); - + AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector, TClonesArray *tofArray); AliEveTOFSector(TGeoManager *localGeoManager, Int_t nSector, TTree *tofTree); virtual ~AliEveTOFSector(); - + static Bool_t fgStaticInitDone; static void InitStatics(); @@ -96,12 +96,12 @@ Int_t GetSectorID() const {return fSectorID;}; virtual void DigitSelected(Int_t idx); /////////////////////////////////////////// - + void SetPlate(Int_t nPlate, Bool_t r); static TEveFrameBox *fgTOFsectorFrameBox; static TEveRGBAPalette *fgTOFsectorPalette; ClassDef(AliEveTOFSector, 1); - }; + }; #endif diff --git a/EVE/Alieve/AliEveTOFSectorEditor.cxx b/EVE/Alieve/AliEveTOFSectorEditor.cxx index 2ced8639d6f..88b9e1129a2 100644 --- a/EVE/Alieve/AliEveTOFSectorEditor.cxx +++ b/EVE/Alieve/AliEveTOFSectorEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTOFSectorEditor.h" @@ -27,7 +27,7 @@ // ClassImp(AliEveTOFSectorEditor) - + AliEveTOFSectorEditor::AliEveTOFSectorEditor(const TGWindow *p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back), @@ -39,21 +39,21 @@ ClassImp(AliEveTOFSectorEditor) // fTime (0) // Initialize widget pointers to 0 //{ - + /* fHMTrans = new TEveTransSubEditor(this); fHMTrans->Connect("UseTrans()", "AliEveTPCSectorVizEditor", this, "Update()"); fHMTrans->Connect("TransChanged()", "AliEveTPCSectorVizEditor", this, "Update()"); AddFrame(fHMTrans, new TGLayoutHints(kLHintsTop | kLHintsExpandX, 2, 0, 0, 0)); - + MakeTitle("AliEveTPCSectorViz");*/ { - + fPlate = new TGCheckButton*[5]; for (Int_t ii=0; ii<5; ii++) fPlate[ii] = new TGCheckButton; - + //fPriority = 40; - MakeTitle("AliEveTOFSector"); + MakeTitle("AliEveTOFSector"); fSectorID = new TEveGValuator(this, "SectorID", 110, 0); fSectorID->SetLabelWidth(60); @@ -70,7 +70,7 @@ ClassImp(AliEveTOFSectorEditor) fSectorID->AddFrame(fAutoTrans, new TGLayoutHints(kLHintsLeft, 12, 0, 1, 0)); fAutoTrans->Connect("Toggled(Bool_t)","AliEveTOFSectorEditor", this, "DoAutoTrans()"); AddFrame(fSectorID, new TGLayoutHints(kLHintsTop, 1, 1, 1, 1)); - + // Create widgets // fXYZZ = new TGSomeWidget(this, ...); // AddFrame(fXYZZ, new TGLayoutHints(...)); @@ -125,7 +125,7 @@ ClassImp(AliEveTOFSectorEditor) fThreshold->Connect("ValueSet(Double_t)", "AliEveTOFSectorEditor", this, "DoThreshold()"); AddFrame(fThreshold, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); - + fMaxVal = new TEveGValuator(this,"MaxVal", 200, 0); fMaxVal->SetNELength(4); fMaxVal->SetLabelWidth(60); @@ -135,7 +135,7 @@ ClassImp(AliEveTOFSectorEditor) fMaxVal->Connect("ValueSet(Double_t)", "AliEveTOFSectorEditor", this, "DoMaxVal()"); AddFrame(fMaxVal, new TGLayoutHints(kLHintsTop, 1, 1, 2, 1)); - + } @@ -231,7 +231,7 @@ void AliEveTOFSectorEditor::DoMaxVal() /**************************************************************************/ /* void AliEveTOFSectorEditor::DoTime() -{ +{ fM->SetMinTime((Int_t) fTime->GetMin()); fM->SetMaxTime((Int_t) fTime->GetMax()); Update(); diff --git a/EVE/Alieve/AliEveTOFSectorEditor.h b/EVE/Alieve/AliEveTOFSectorEditor.h index bb883ce046d..24bc495b0b9 100644 --- a/EVE/Alieve/AliEveTOFSectorEditor.h +++ b/EVE/Alieve/AliEveTOFSectorEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TOFSectorEditor_H @@ -23,9 +23,9 @@ class TEveGValuator; class TEveGDoubleValuator; class TEveTransSubEditor; - + class AliEveTOFSector; - + class AliEveTOFSectorEditor : public TGedFrame { //private: @@ -34,9 +34,9 @@ class TEveTransSubEditor; protected: AliEveTOFSector* fM; // fModel dynamic-casted to AliEveTOFSectorEditor - + TEveGValuator* fSectorID; - + TGCheckButton* fAutoTrans; TGCheckButton** fPlate; @@ -48,19 +48,19 @@ class TEveTransSubEditor; TGCheckButton* fPlate4; TEveGValuator* fThreshold; - TEveGValuator* fMaxVal; + TEveGValuator* fMaxVal; // Declare widgets // TGSomeWidget* fXYZZ; - + public: AliEveTOFSectorEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, UInt_t options = kChildFrame, Pixel_t back=GetDefaultFrameBackground()); virtual ~AliEveTOFSectorEditor(); - + virtual void SetModel(TObject* obj); void DoSectorID(); - void DoAutoTrans(); + void DoAutoTrans(); void DoPlate0(); void DoPlate1(); void DoPlate2(); @@ -74,8 +74,8 @@ class TEveTransSubEditor; // Declare callback/slot methods // void DoXYZZ(); - + ClassDef(AliEveTOFSectorEditor, 0); // Editor for AliEveTOFSector }; // endclass AliEveTOFSectorEditor - + #endif diff --git a/EVE/Alieve/AliEveTOFStrip.cxx b/EVE/Alieve/AliEveTOFStrip.cxx index 51e64269d39..a8223117d81 100644 --- a/EVE/Alieve/AliEveTOFStrip.cxx +++ b/EVE/Alieve/AliEveTOFStrip.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTOFStrip.h" @@ -50,7 +50,7 @@ AliEveTOFStrip::AliEveTOFStrip(TGeoManager *localGeoManager, fDx(0), fDz(0), fGeoManager(localGeoManager) { - + //if (!fGeoManager) printf("ERROR: no TGeo\n"); InitModule(); @@ -128,7 +128,7 @@ void AliEveTOFStrip::InitModule() //fFrame = fgTOFstripFrameBox; //fPalette = fgTOFstripPalette; - LoadQuads(); + LoadQuads(); ComputeBBox(); SetTrans(); @@ -181,7 +181,7 @@ void AliEveTOFStrip::LoadQuads() } RefitPlex(); - + } /* ************************************************************ */ @@ -198,7 +198,7 @@ void AliEveTOFStrip::SetTrans() fGeoManager->cd(path); TGeoHMatrix global = *fGeoManager->GetCurrentMatrix(); Double_t *rotMat = global.GetRotationMatrix(); - + /* // ok till 19 April 2007 fHMTrans.SetBaseVec(1, rotMat[0], rotMat[1], rotMat[2]); diff --git a/EVE/Alieve/AliEveTOFStrip.h b/EVE/Alieve/AliEveTOFStrip.h index 5a288a7df89..dacf60ffd89 100644 --- a/EVE/Alieve/AliEveTOFStrip.h +++ b/EVE/Alieve/AliEveTOFStrip.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TOFStrip_H #define ALIEVE_TOFStrip_H @@ -28,7 +28,7 @@ class AliEveTOFStrip : public TEveQuadSet private: void LoadQuads(); - + protected: virtual void InitModule(); virtual void SetTrans(); @@ -64,5 +64,5 @@ public: static TEveRGBAPalette* fgTOFstripPalette; ClassDef(AliEveTOFStrip, 1); -}; +}; #endif diff --git a/EVE/Alieve/AliEveTOFStripEditor.cxx b/EVE/Alieve/AliEveTOFStripEditor.cxx index 79a487e6de6..fa54e296356 100644 --- a/EVE/Alieve/AliEveTOFStripEditor.cxx +++ b/EVE/Alieve/AliEveTOFStripEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTOFStripEditor.h" diff --git a/EVE/Alieve/AliEveTOFStripEditor.h b/EVE/Alieve/AliEveTOFStripEditor.h index cba3efd7d44..123f8ed6317 100644 --- a/EVE/Alieve/AliEveTOFStripEditor.h +++ b/EVE/Alieve/AliEveTOFStripEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TOFStripEditor_H diff --git a/EVE/Alieve/AliEveTPCData.cxx b/EVE/Alieve/AliEveTPCData.cxx index c5c7d86579e..299eb1d0732 100644 --- a/EVE/Alieve/AliEveTPCData.cxx +++ b/EVE/Alieve/AliEveTPCData.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCData.h" @@ -31,7 +31,7 @@ // load time: use SetLoadThreshold(thresh) and SetLoadPedestal(ped). // // For raw-data (loaded using LoadRaw) pedestals can be calculated -// automatically per pad. Use SetAutoPedestal(kTRUE) to activate it. +// automatically per pad. Use SetAutoPedestal(kTRUE) to activate it. // You might still want to set load threshold (default iz zero). // @@ -100,7 +100,7 @@ void AliEveTPCData::LoadDigits(TTree* tree, Bool_t spawnSectors) AliSimDigits digit, *digitPtr = &digit; tree->GetBranch("Segment")->SetAddress(&digitPtr); - + Int_t sector, row, pad, curPad; Short_t time, signal; Bool_t inFill = kFALSE; diff --git a/EVE/Alieve/AliEveTPCData.h b/EVE/Alieve/AliEveTPCData.h index 81603da81ef..13ee5ac4603 100644 --- a/EVE/Alieve/AliEveTPCData.h +++ b/EVE/Alieve/AliEveTPCData.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCData_H diff --git a/EVE/Alieve/AliEveTPCLoader.cxx b/EVE/Alieve/AliEveTPCLoader.cxx index 5ee7549eff9..b5f02b8606c 100644 --- a/EVE/Alieve/AliEveTPCLoader.cxx +++ b/EVE/Alieve/AliEveTPCLoader.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCLoader.h" @@ -117,7 +117,7 @@ void AliEveTPCLoader::LoadEvent() fReader->Select("TPC"); fData->DropAllSectors(); - fData->LoadRaw(input, kTRUE, kTRUE); + fData->LoadRaw(input, kTRUE, kTRUE); } void AliEveTPCLoader::NextEvent(Bool_t rewindOnEnd) diff --git a/EVE/Alieve/AliEveTPCLoader.h b/EVE/Alieve/AliEveTPCLoader.h index d0e94848ae6..3a7fb1d7ac2 100644 --- a/EVE/Alieve/AliEveTPCLoader.h +++ b/EVE/Alieve/AliEveTPCLoader.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCLoader_H diff --git a/EVE/Alieve/AliEveTPCLoaderEditor.cxx b/EVE/Alieve/AliEveTPCLoaderEditor.cxx index 7091a0a4e66..1cf57b522f1 100644 --- a/EVE/Alieve/AliEveTPCLoaderEditor.cxx +++ b/EVE/Alieve/AliEveTPCLoaderEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCLoaderEditor.h" diff --git a/EVE/Alieve/AliEveTPCLoaderEditor.h b/EVE/Alieve/AliEveTPCLoaderEditor.h index c4369cb98c8..f536e08f3b9 100644 --- a/EVE/Alieve/AliEveTPCLoaderEditor.h +++ b/EVE/Alieve/AliEveTPCLoaderEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCLoaderEditor_H diff --git a/EVE/Alieve/AliEveTPCSector2D.cxx b/EVE/Alieve/AliEveTPCSector2D.cxx index 62205858328..3fbe226e296 100644 --- a/EVE/Alieve/AliEveTPCSector2D.cxx +++ b/EVE/Alieve/AliEveTPCSector2D.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCSector2D.h" @@ -165,7 +165,7 @@ void AliEveTPCSector2D::Paint(Option_t* ) buffer.fTransparency = 0; fHMTrans.SetBuffer3D(buffer); buffer.SetSectionsValid(TBuffer3D::kCore); - + Int_t reqSections = gPad->GetViewer3D()->AddObject(buffer); if (reqSections == TBuffer3D::kNone) { return; diff --git a/EVE/Alieve/AliEveTPCSector2D.h b/EVE/Alieve/AliEveTPCSector2D.h index 9ac6d5902c1..e5fd0958c36 100644 --- a/EVE/Alieve/AliEveTPCSector2D.h +++ b/EVE/Alieve/AliEveTPCSector2D.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCSector2D_H diff --git a/EVE/Alieve/AliEveTPCSector2DEditor.cxx b/EVE/Alieve/AliEveTPCSector2DEditor.cxx index dcea77dd8dd..597c5b925da 100644 --- a/EVE/Alieve/AliEveTPCSector2DEditor.cxx +++ b/EVE/Alieve/AliEveTPCSector2DEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCSector2DEditor.h" diff --git a/EVE/Alieve/AliEveTPCSector2DEditor.h b/EVE/Alieve/AliEveTPCSector2DEditor.h index f3251aff63c..2eff2ff1e2a 100644 --- a/EVE/Alieve/AliEveTPCSector2DEditor.h +++ b/EVE/Alieve/AliEveTPCSector2DEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCSector2DEditor_H diff --git a/EVE/Alieve/AliEveTPCSector2DGL.cxx b/EVE/Alieve/AliEveTPCSector2DGL.cxx index b475b127684..9c6cf06b8c7 100644 --- a/EVE/Alieve/AliEveTPCSector2DGL.cxx +++ b/EVE/Alieve/AliEveTPCSector2DGL.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCSector2DGL.h" @@ -33,7 +33,7 @@ const Int_t AliEveTPCSector2DGL::fgkTextureByteSize = 4*256*128; AliEveTPCSector2DGL::AliEveTPCSector2DGL() : TGLObject(), - + fSector (0), fSectorData (0), @@ -155,7 +155,7 @@ void AliEveTPCSector2DGL::LoadPadrow(AliEveTPCSectorData::RowIterator& iter, Int_t row, Int_t col_off) const { Int_t padVal; - Int_t time, val; + Int_t time, val; Int_t minTime = fSector->fMinTime; Int_t maxTime = fSector->fMaxTime; @@ -163,7 +163,7 @@ void AliEveTPCSector2DGL::LoadPadrow(AliEveTPCSectorData::RowIterator& iter, UChar_t* img_pos = GetRowCol(row, col_off); while (iter.NextPad()) { - padVal = 0; + padVal = 0; while (iter.Next()) { time = iter.Time(); @@ -255,7 +255,7 @@ void AliEveTPCSector2DGL::DisplayTexture(const AliEveTPCSectorData::SegmentInfo& Float_t u2 = u1 + (Float_t) seg.GetNMaxPads() / fgkTextureWidth; Float_t v2 = v1 + (Float_t) seg.GetNRows() / fgkTextureHeight; - glBegin(GL_QUADS); + glBegin(GL_QUADS); glTexCoord2f(u1, v1); glVertex2f(-w, y1); glTexCoord2f(u1, v2); glVertex2f(-w, y2); glTexCoord2f(u2, v2); glVertex2f( w, y2); @@ -351,7 +351,7 @@ void AliEveTPCSector2DGL::TraceStepsUp(const AliEveTPCSectorData::SegmentInfo& s glVertex2f(-s.GetNMaxPads()*s.GetPadWidth()/2, y); } -void AliEveTPCSector2DGL::TraceStepsDown(const AliEveTPCSectorData::SegmentInfo& s) +void AliEveTPCSector2DGL::TraceStepsDown(const AliEveTPCSectorData::SegmentInfo& s) { Float_t x = s.GetNMaxPads()*s.GetPadWidth()/2; Float_t y = s.GetRLow() + s.GetNRows()*s.GetPadHeight(); diff --git a/EVE/Alieve/AliEveTPCSector2DGL.h b/EVE/Alieve/AliEveTPCSector2DGL.h index 5d65bd7a36d..b5c105a8dd6 100644 --- a/EVE/Alieve/AliEveTPCSector2DGL.h +++ b/EVE/Alieve/AliEveTPCSector2DGL.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCSector2DGL_H @@ -46,12 +46,12 @@ protected: mutable UChar_t* fImage; mutable UInt_t fTexture; mutable UInt_t fRTS; - + public: AliEveTPCSector2DGL(); virtual ~AliEveTPCSector2DGL(); - virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); + virtual Bool_t SetModel(TObject* obj, const Option_t* opt=0); virtual void SetBBox(); virtual Bool_t SupportsSecondarySelect() const { return kTRUE; } @@ -65,7 +65,7 @@ public: static const Int_t fgkTextureByteSize; }; // endclass TPCSector2D_GL_Rnr - + inline UChar_t* AliEveTPCSector2DGL::GetRowCol(Int_t row, Int_t col) const { diff --git a/EVE/Alieve/AliEveTPCSector3D.cxx b/EVE/Alieve/AliEveTPCSector3D.cxx index 2a6f6bf0604..3e1dbbee6aa 100644 --- a/EVE/Alieve/AliEveTPCSector3D.cxx +++ b/EVE/Alieve/AliEveTPCSector3D.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCSector3D.h" @@ -90,7 +90,7 @@ void AliEveTPCSector3D::Paint(Option_t* /*option*/) buffer.fTransparency = 0; fHMTrans.SetBuffer3D(buffer); buffer.SetSectionsValid(TBuffer3D::kCore); - + Int_t reqSections = gPad->GetViewer3D()->AddObject(buffer); if (reqSections == TBuffer3D::kNone) { return; @@ -103,7 +103,7 @@ void AliEveTPCSector3D::Paint(Option_t* /*option*/) /**************************************************************************/ void AliEveTPCSector3D::LoadPadrow(AliEveTPCSectorData::RowIterator& iter, - Float_t xs, Float_t ys, Float_t pw, Float_t ph) + Float_t xs, Float_t ys, Float_t pw, Float_t ph) { Short_t pad, time, val; Float_t x0, z0; diff --git a/EVE/Alieve/AliEveTPCSector3D.h b/EVE/Alieve/AliEveTPCSector3D.h index 84c1743e8ad..217d60cb878 100644 --- a/EVE/Alieve/AliEveTPCSector3D.h +++ b/EVE/Alieve/AliEveTPCSector3D.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCSector3D_H diff --git a/EVE/Alieve/AliEveTPCSector3DEditor.cxx b/EVE/Alieve/AliEveTPCSector3DEditor.cxx index 587486df8b8..46f4da51765 100644 --- a/EVE/Alieve/AliEveTPCSector3DEditor.cxx +++ b/EVE/Alieve/AliEveTPCSector3DEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCSector3DEditor.h" diff --git a/EVE/Alieve/AliEveTPCSector3DEditor.h b/EVE/Alieve/AliEveTPCSector3DEditor.h index 9445505b8d1..20493937d2e 100644 --- a/EVE/Alieve/AliEveTPCSector3DEditor.h +++ b/EVE/Alieve/AliEveTPCSector3DEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCSector3DEditor_H @@ -38,7 +38,7 @@ protected: public: AliEveTPCSector3DEditor(const TGWindow* p=0, Int_t width=170, Int_t height=30, - UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameBackground()); + UInt_t options=kChildFrame, Pixel_t back=GetDefaultFrameBackground()); virtual ~AliEveTPCSector3DEditor(); virtual void SetModel(TObject* obj); diff --git a/EVE/Alieve/AliEveTPCSector3DGL.cxx b/EVE/Alieve/AliEveTPCSector3DGL.cxx index 5b93761b5d5..a949a22d0a8 100644 --- a/EVE/Alieve/AliEveTPCSector3DGL.cxx +++ b/EVE/Alieve/AliEveTPCSector3DGL.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCSector3DGL.h" @@ -80,7 +80,7 @@ void AliEveTPCSector3DGL::DirectDraw(TGLRnrCtx & rnrCtx) const if(fRTS < fSector->fRTS) { fSector->UpdateBoxes(); fRTS = fSector->fRTS; - } + } if (rnrCtx.SecSelection()) glPushName(0); diff --git a/EVE/Alieve/AliEveTPCSector3DGL.h b/EVE/Alieve/AliEveTPCSector3DGL.h index 51db92d58cb..364aed29f9d 100644 --- a/EVE/Alieve/AliEveTPCSector3DGL.h +++ b/EVE/Alieve/AliEveTPCSector3DGL.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCSector3DGL_H diff --git a/EVE/Alieve/AliEveTPCSectorData.cxx b/EVE/Alieve/AliEveTPCSectorData.cxx index c360c0af09d..ea3f9ee22f6 100644 --- a/EVE/Alieve/AliEveTPCSectorData.cxx +++ b/EVE/Alieve/AliEveTPCSectorData.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCSectorData.h" @@ -86,7 +86,7 @@ void AliEveTPCSectorData::InitStatics() fgOut1Seg.fLastRow = fgOut1Seg.fFirstRow + fgOut1Seg.fNRows - 1; fgOut1Seg.fNMaxPads = fgParam->GetNPadsUp(fgOut1Seg.fNRows - 1); fgSegInfoPtrs[1] = &fgOut1Seg; - + fgOut2Seg.fPadWidth = fgParam->GetOuterPadPitchWidth(); fgOut2Seg.fPadHeight = fgParam->GetOuter2PadPitchLength(); fgOut2Seg.fRLow = fgParam->GetPadRowRadiiUp(fgOut1Seg.fNRows); @@ -108,7 +108,7 @@ void AliEveTPCSectorData::InitStatics() } } fgInnSeg.fNYSteps = k; - // Out1 seg + // Out1 seg k=0; npads = fgParam->GetNPadsUp(0); for (int row = 0; row < fgOut1Seg.fNRows; ++row) { if (fgParam->GetNPadsUp(row) > npads) { @@ -234,11 +234,11 @@ void AliEveTPCSectorData::EndPad(Bool_t autoPedestal, Short_t threshold) if(autoPedestal) { Short_t array[1024]; Short_t* val; - val = beg + 1; + val = beg + 1; while(val <= end) { array[(val-beg)/2] = *val; val += 2; - } + } Short_t pedestal = TMath::Nint(TMath::Median((end-beg)/2, array)); val = beg + 1; while(val <= end) { diff --git a/EVE/Alieve/AliEveTPCSectorData.h b/EVE/Alieve/AliEveTPCSectorData.h index 8e164c6e3b6..c83ba7a9e62 100644 --- a/EVE/Alieve/AliEveTPCSectorData.h +++ b/EVE/Alieve/AliEveTPCSectorData.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCSectorData_H @@ -111,7 +111,7 @@ public: Bool_t NextPad(); void ResetRow(); void ResetRow(const PadData* first, Short_t npads); - + Short_t TEvePad() const { return fPad; } void Test(); @@ -213,7 +213,7 @@ public: static const SegmentInfo& GetOut2Seg() { return fgOut2Seg; } static const SegmentInfo& GetSeg(Int_t seg); - + static void InitStatics(); @@ -241,7 +241,7 @@ public: protected: void* fPadRowHackSet; - + ClassDef(AliEveTPCSectorData, 0); }; // endclass AliEveTPCSectorData diff --git a/EVE/Alieve/AliEveTPCSectorViz.cxx b/EVE/Alieve/AliEveTPCSectorViz.cxx index 42eee317f42..90e42ced76d 100644 --- a/EVE/Alieve/AliEveTPCSectorViz.cxx +++ b/EVE/Alieve/AliEveTPCSectorViz.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCSectorViz.h" @@ -113,7 +113,7 @@ void AliEveTPCSectorViz::SetMaxVal(Int_t mv) /**************************************************************************/ -void AliEveTPCSectorViz::SetAutoTrans(Bool_t trans) +void AliEveTPCSectorViz::SetAutoTrans(Bool_t trans) { fAutoTrans = trans; if(fAutoTrans) { diff --git a/EVE/Alieve/AliEveTPCSectorViz.h b/EVE/Alieve/AliEveTPCSectorViz.h index 102aa5dd5fc..38f4ece1f09 100644 --- a/EVE/Alieve/AliEveTPCSectorViz.h +++ b/EVE/Alieve/AliEveTPCSectorViz.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCSectorViz_H @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include @@ -41,10 +41,10 @@ class AliEveTPCSectorViz : public TEveElement, AliEveTPCSectorViz& operator=(const AliEveTPCSectorViz&); // Not implemented protected: - AliEveTPCData* fTPCData; + AliEveTPCData* fTPCData; Int_t fSectorID; - Int_t fMinTime; + Int_t fMinTime; Int_t fMaxTime; Short_t fThreshold; Int_t fMaxVal; diff --git a/EVE/Alieve/AliEveTPCSectorVizEditor.cxx b/EVE/Alieve/AliEveTPCSectorVizEditor.cxx index d369ea18d77..26b7ad1906a 100644 --- a/EVE/Alieve/AliEveTPCSectorVizEditor.cxx +++ b/EVE/Alieve/AliEveTPCSectorVizEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTPCSectorVizEditor.h" @@ -196,7 +196,7 @@ void AliEveTPCSectorVizEditor::DoMaxVal() /**************************************************************************/ void AliEveTPCSectorVizEditor::DoTime() -{ +{ fM->SetMinTime((Int_t) fTime->GetMin()); fM->SetMaxTime((Int_t) fTime->GetMax()); Update(); diff --git a/EVE/Alieve/AliEveTPCSectorVizEditor.h b/EVE/Alieve/AliEveTPCSectorVizEditor.h index ad564316620..b06e4578499 100644 --- a/EVE/Alieve/AliEveTPCSectorVizEditor.h +++ b/EVE/Alieve/AliEveTPCSectorVizEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TPCSectorVizEditor_H @@ -43,7 +43,7 @@ protected: TGCheckButton* fRnrOut2; TEveGValuator* fThreshold; - TEveGValuator* fMaxVal; + TEveGValuator* fMaxVal; TEveGDoubleValuator* fTime; @@ -65,7 +65,7 @@ public: void DoMaxVal(); void DoTime(); - + ClassDef(AliEveTPCSectorVizEditor, 0); // Editor for AliEveTPCSectorViz }; // endclass AliEveTPCSectorVizEditor diff --git a/EVE/Alieve/AliEveTRDData.cxx b/EVE/Alieve/AliEveTRDData.cxx index 0488a2aef1a..a027262b651 100644 --- a/EVE/Alieve/AliEveTRDData.cxx +++ b/EVE/Alieve/AliEveTRDData.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTRDData.h" #include "AliEveTRDModuleImp.h" @@ -34,7 +34,7 @@ AliEveTRDDigits::AliEveTRDDigits(AliEveTRDChamber *p): TEveQuadSet("digits", "") //________________________________________________________ void AliEveTRDDigits::SetData(AliTRDdigitsManager *digits) { - + fData.Allocate(fParent->rowMax, fParent->colMax, fParent->timeMax); // digits->Expand(); for (Int_t row = 0; row < fParent->rowMax; row++) @@ -56,14 +56,14 @@ void AliEveTRDDigits::ComputeRepresentation() TEveQuadSet::Reset(TEveQuadSet::kQT_FreeQuad, kTRUE, 64); // MT fBoxes.fBoxes.clear(); - + Double_t colSize, rowSize, scale; Double_t x, y, z; Int_t charge; Float_t t0; Float_t timeBinSize; - + AliTRDcalibDB* calibration = AliTRDcalibDB::Instance(); Double_t cloc[4][3], cglo[3]; Int_t color, dimension; @@ -71,37 +71,37 @@ void AliEveTRDDigits::ComputeRepresentation() for (Int_t row = 0; row < fParent->rowMax; row++) { rowSize = .5 * fParent->fPadPlane->GetRowSize(row); z = fParent->fPadPlane->GetRowPos(row) - rowSize; - + for (Int_t col = 0; col < fParent->colMax; col++) { colSize = .5 * fParent->fPadPlane->GetColSize(col); y = fParent->fPadPlane->GetColPos(col) - colSize; t0 = calibration->GetT0(fParent->fDet, col, row); timeBinSize = calibration->GetVdrift(fParent->fDet, col, row)/fParent->samplingFrequency; - + for (Int_t time = 0; time < fParent->timeMax; time++) { charge = fData.GetDataUnchecked(row, col, time); if (charge < fParent->GetDigitsThreshold()) continue; - + x = fParent->fX0 - (time+0.5-t0)*timeBinSize; scale = fParent->GetDigitsLog() ? TMath::Log(float(charge))/TMath::Log(1024.) : charge/1024.; color = 50+int(scale*50.); - + cloc[0][2] = z - rowSize * scale; cloc[0][1] = y - colSize * scale; cloc[0][0] = x; - + cloc[1][2] = z - rowSize * scale; cloc[1][1] = y + colSize * scale; cloc[1][0] = x; - + cloc[2][2] = z + rowSize * scale; cloc[2][1] = y + colSize * scale; cloc[2][0] = x; - + cloc[3][2] = z + rowSize * scale; cloc[3][1] = y - colSize * scale; cloc[3][0] = x; - + Float_t* p = 0; if( fParent->GetDigitsBox()){ // MT fBoxes.fBoxes.push_back(Box()); @@ -237,7 +237,7 @@ void AliEveTRDDigitsEditor::SetModel(TObject* obj) { fM = dynamic_cast(obj); fM->fParent->SpawnEditor(); - + // printf("Chamber %d", fM->fParent->GetID()); // for (Int_t row = 0; row < fM->fParent->GetRowMax(); row++) // for (Int_t col = 0; col < fM->fParent->GetColMax(); col++) diff --git a/EVE/Alieve/AliEveTRDData.h b/EVE/Alieve/AliEveTRDData.h index b5d0a0c5ef7..636719c4eaf 100644 --- a/EVE/Alieve/AliEveTRDData.h +++ b/EVE/Alieve/AliEveTRDData.h @@ -4,12 +4,12 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ ///////////////////////////////////////////////////////////////////////// // // - AliEVE implementation - -// Containers for visualisation of TRD data structures +// Containers for visualisation of TRD data structures // - AliEveTRDHits - visualisation of MC Hits, Clusters (RecPoints) // - AliEveTRDDigits - visualisation of TRD digits // @@ -49,7 +49,7 @@ class AliTRDdigitsManager; protected: AliEveTRDChamber *fParent; - + ClassDef(AliEveTRDHits,1) // Base class for TRD hits visualisation }; @@ -65,7 +65,7 @@ class AliTRDdigitsManager; AliEveTRDHits* fM; ClassDef(AliEveTRDHitsEditor,1) // Editor for AliEveTRDHits - }; + }; class AliEveTRDDigits : public TEveQuadSet @@ -81,14 +81,14 @@ class AliTRDdigitsManager; protected: AliEveTRDChamber *fParent; - + private: TEveBoxSet fBoxes; AliTRDdataArrayI fData; - + ClassDef(AliEveTRDDigits,1) // Digits visualisation for TRD }; - + class AliEveTRDDigitsEditor : public TGedFrame { public: @@ -110,7 +110,7 @@ class AliTRDdigitsManager; AliEveTRDClusters(AliEveTRDChamber *p); void PointSelected(Int_t n); - + ClassDef(AliEveTRDClusters,1) // Base class for TRD clusters visualisation }; diff --git a/EVE/Alieve/AliEveTRDLoader.cxx b/EVE/Alieve/AliEveTRDLoader.cxx index 0f2f4471cbb..ed2cc635c32 100644 --- a/EVE/Alieve/AliEveTRDLoader.cxx +++ b/EVE/Alieve/AliEveTRDLoader.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTRDLoader.h" #include "AliEveTRDModuleImp.h" @@ -53,7 +53,7 @@ ClassImp(AliEveTRDLoaderEditor) //________________________________________________________ AliEveTRDLoader::AliEveTRDLoader(const Text_t* n, const Text_t* t) : TEveElementList(n, t), fSM(-1), fStack(-1), fLy(-1), fEvent(0) -{ +{ kLoadHits = kFALSE; kLoadDigits = kFALSE; kLoadClusters = kFALSE; @@ -62,9 +62,9 @@ AliEveTRDLoader::AliEveTRDLoader(const Text_t* n, const Text_t* t) : TEveElement fDir = "."; fEvent = -1; - fTRD = 0x0; + fTRD = 0x0; fGeo = new AliTRDgeometry(); - + AliCDBManager *fCDBManager=AliCDBManager::Instance(); fCDBManager->SetDefaultStorage("local://$ALICE_ROOT"); fCDBManager->SetRun(0); @@ -144,7 +144,7 @@ void AliEveTRDLoader::AddChambers(int sm, int stk, int ly) AliEveTRDChamber* AliEveTRDLoader::GetChamber(int d) { List_i ism, istack, ichmb; - + ism = find_if(fChildren.begin(), fChildren.end(), ID(fGeo->GetSector(d))); if(ism == fChildren.end()) return 0x0; istack = find_if(((AliEveTRDNode*)(*ism))->begin(), ((AliEveTRDNode*)(*ism))->end(), ID(fGeo->GetChamber(d))); @@ -165,7 +165,7 @@ Bool_t AliEveTRDLoader::GoToEvent(int ev) fEvent = ev; Unload(); - + TTree *t = 0x0; TFile *f = new TFile(Form("%s/%s", fDir.Data(), fFilename.Data())); if(! f->cd(Form("AliEveEventManager%d", ev))){ @@ -173,7 +173,7 @@ Bool_t AliEveTRDLoader::GoToEvent(int ev) f->Close(); delete f; return kFALSE; } - + if(kLoadDigits){ t = (TTree*)gDirectory->Get("TreeD"); if(!t) return kFALSE; @@ -189,9 +189,9 @@ Bool_t AliEveTRDLoader::GoToEvent(int ev) } else AliWarning("Please select first the type of data that you want to monitor and then hit the \"Load\" button."); f->Close(); delete f; - + gEve->Redraw3D(); - + return kTRUE; } @@ -205,7 +205,7 @@ Bool_t AliEveTRDLoader::LoadClusters(TTree *tC) TObjArray *clusters = new TObjArray(); tC->SetBranchAddress("TRDcluster", &clusters); - AliEveTRDChamber *chmb = 0x0; + AliEveTRDChamber *chmb = 0x0; AliTRDcluster *c=0x0; for(int idet=0; idet<540; idet++){ tC->GetEntry(idet); @@ -222,9 +222,9 @@ Bool_t AliEveTRDLoader::LoadClusters(TTree *tC) Bool_t AliEveTRDLoader::LoadDigits(TTree *tD) { AliInfo("Loading ..."); - + if(!fChildren.size()) return kTRUE; - + AliEveTRDChamber *chmb; AliTRDdigitsManager dm; dm.ReadDigits(tD); @@ -247,7 +247,7 @@ Bool_t AliEveTRDLoader::LoadTracklets(TTree *tT) TObjArray *tracks = new TObjArray(); tT->SetBranchAddress("TRDmcmTracklet",&tracks); - + AliEveTRDChamber *chmb = 0x0; AliTRDmcmTracklet *trk=0x0; for(int idet=0; idet<540; idet++){ @@ -255,10 +255,10 @@ Bool_t AliEveTRDLoader::LoadTracklets(TTree *tT) if(tracks->GetEntriesFast()) trk = (AliTRDmcmTracklet*)tracks->UncheckedAt(0); if((chmb = GetChamber(trk->GetDetector()))) chmb->LoadTracklets(tracks); } - + return kTRUE; } - + //________________________________________________________ Bool_t AliEveTRDLoader::Open(const char *filename, const char *dir) @@ -269,7 +269,7 @@ Bool_t AliEveTRDLoader::Open(const char *filename, const char *dir) count += kLoadDigits ? 1 : 0; count += kLoadClusters ? 1 : 0; count += kLoadTracks ? 1 : 0; - + TObjArray *so = fFilename.Tokenize("."); if(((TObjString*)(*so)[0])->GetString().CompareTo("TRD") != 0){ @@ -297,7 +297,7 @@ Bool_t AliEveTRDLoader::Open(const char *filename, const char *dir) AliError("Filename didn't fulfill naming conventions. No data will be loaded."); return kFALSE; } - + return kTRUE; } @@ -348,11 +348,11 @@ void AliEveTRDLoader::Unload() AliEveTRDLoaderEditor::AliEveTRDLoaderEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) { MakeTitle("AliEveTRDLoader"); - + fFile = 0x0; TGTextButton *fOpenFile = 0x0; Int_t labelW = 42; - + TGHorizontalFrame* f = new TGHorizontalFrame(this); TGHorizontalFrame* g = new TGHorizontalFrame(f, labelW, 0, kFixedWidth); TGLabel* l = new TGLabel(g, "File: "); @@ -363,13 +363,13 @@ AliEveTRDLoaderEditor::AliEveTRDLoaderEditor(const TGWindow* p, Int_t width, Int fFile->SetWidth(140); fFile->Connect("DoubleClicked()", "AliEveTRDLoaderEditor", this, "FileOpen()"); f->AddFrame(fFile); - + fOpenFile = new TGTextButton(f, "Browse"); f->AddFrame(fOpenFile); fOpenFile->Connect("Clicked()", "AliEveTRDLoaderEditor", this, "FileOpen()"); AddFrame(f); - + fEvent = new TEveGValuator(this, "AliEveEventManager:", 110, 0); fEvent->SetShowSlider(kFALSE); fEvent->SetLabelWidth(labelW); @@ -385,7 +385,7 @@ AliEveTRDLoaderEditor::AliEveTRDLoaderEditor(const TGWindow* p, Int_t width, Int // "Chamber(s) selector" group frame TGGroupFrame *fGroupFrame1974 = new TGGroupFrame(this,"Chamber(s) selector"); TGVerticalFrame *fVerticalFrame1974 = new TGVerticalFrame(fGroupFrame1974, 150, 50,kVerticalFrame); - + fSMNumber = new TEveGValuator(fVerticalFrame1974, "SM:", 0, 0); fSMNumber->SetShowSlider(kFALSE); fSMNumber->SetLabelWidth(labelW); @@ -413,7 +413,7 @@ AliEveTRDLoaderEditor::AliEveTRDLoaderEditor(const TGWindow* p, Int_t width, Int fPlaneNumber->SetToolTip("Plane id [-1 for all in this stack]"); fVerticalFrame1974->AddFrame(fPlaneNumber, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterX | kLHintsExpandY,2,2,2,2)); - + fGroupFrame1974->AddFrame(fVerticalFrame1974, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsExpandY | kLHintsCenterX,2,2,2,2)); TGTextButton *fTextButton2037 = new TGTextButton(fGroupFrame1974,"Select"); @@ -452,7 +452,7 @@ void AliEveTRDLoaderEditor::SetModel(TObject* obj) fEvent->SetEnabled(kFile); fEvent->GetEntry()->SetIntNumber(fM->fEvent); - + fSMNumber->SetEnabled(kFile); fSMNumber->GetEntry()->SetIntNumber(fM->fSM); diff --git a/EVE/Alieve/AliEveTRDLoader.h b/EVE/Alieve/AliEveTRDLoader.h index 47700356774..4fc841cb60d 100644 --- a/EVE/Alieve/AliEveTRDLoader.h +++ b/EVE/Alieve/AliEveTRDLoader.h @@ -4,14 +4,14 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TRDLoader_H #define ALIEVE_TRDLoader_H //////////////////////////////////////////////////////////////////////// // // - ALIEVE implementation - -// Loader for the TRD detector - base class +// Loader for the TRD detector - base class // - AliEveTRDLoader - loader of TRD data (simulation + measured) // - AliEveTRDLoaderEditor - UI // @@ -63,19 +63,19 @@ class TEveGValuator; protected: Bool_t kLoadHits, kLoadDigits, kLoadClusters, kLoadTracks; Int_t fSM, fStack, fLy; // supermodule, stack, layer - TString fFilename; // name of data file + TString fFilename; // name of data file TString fDir; // data directory Int_t fEvent; // current event to be displayed - + AliTRDv1 *fTRD; // the TRD detector AliTRDgeometry *fGeo; // the TRD geometry - + ClassDef(AliEveTRDLoader, 1) // Alieve Loader class for the TRD detector }; - + class AliEveTRDLoaderEditor : public TGedFrame { public: @@ -87,14 +87,14 @@ class TEveGValuator; virtual void Load(); virtual void SetEvent(Double_t ev){fM->fEvent = (Int_t)ev;} virtual void SetModel(TObject* obj); - + protected: AliEveTRDLoader *fM; TGTextEntry *fFile; TEveGValuator *fEvent; TEveGValuator *fSMNumber, *fStackNumber, *fPlaneNumber; - + ClassDef(AliEveTRDLoaderEditor,1) // Editor for AliEveTRDLoader }; - + #endif diff --git a/EVE/Alieve/AliEveTRDLoaderImp.cxx b/EVE/Alieve/AliEveTRDLoaderImp.cxx index 8951b19e605..b9e032c6539 100644 --- a/EVE/Alieve/AliEveTRDLoaderImp.cxx +++ b/EVE/Alieve/AliEveTRDLoaderImp.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTRDLoaderImp.h" #include "AliEveTRDModuleImp.h" @@ -63,7 +63,7 @@ Bool_t AliEveTRDLoaderSim::GoToEvent(int ev) AliWarning("Please select first the type of data that you want to monitor and then hit the \"Load\" button."); return kFALSE; } - + fEvent = ev; if(!fRunLoader){ @@ -72,7 +72,7 @@ Bool_t AliEveTRDLoaderSim::GoToEvent(int ev) } fRunLoader->UnloadAll("TRD"); Unload(); - + if(fRunLoader->GetEvent(ev)) return kFALSE; TTree *t = 0x0; if(kLoadHits){ @@ -112,7 +112,7 @@ Bool_t AliEveTRDLoaderSim::LoadHits(TTree *tH) { Info("LoadHits()", "Loading ..."); if(!fChildren.size()) return kTRUE; - + AliEveTRDChamber *chmb = 0x0; AliTRDhit *hit = 0x0; Int_t d; @@ -140,11 +140,11 @@ Bool_t AliEveTRDLoaderSim::Open(const char *filename, const char *dir) { //Info("Open()", ""); - + fFilename = filename; fDir = dir; fDir += "/"; - + fRunLoader = AliRunLoader::GetRunLoader(); if(!fRunLoader) fRunLoader = AliRunLoader::Open(filename, AliConfig::GetDefaultEventFolderName(),"read"); @@ -153,7 +153,7 @@ Bool_t AliEveTRDLoaderSim::Open(const char *filename, const char *dir) return kFALSE; } fRunLoader->SetDirName(fDir); - + gAlice = fRunLoader->GetAliRun(); if(!gAlice) fRunLoader->LoadgAlice(); if(!gAlice){ @@ -165,11 +165,11 @@ Bool_t AliEveTRDLoaderSim::Open(const char *filename, const char *dir) AliError("Couldn't find TRD"); return kFALSE; } - + return kTRUE; } - + /////////////////////////////////////////////////////////// ///////////// AliEveTRDLoaderRaw ///////////////////// @@ -204,7 +204,7 @@ Bool_t AliEveTRDLoaderRaw::Open(const char *filename, const char *dir) if(fRaw) delete fRaw; fRaw = new AliTRDrawData(); - + if(fDataRoot){ if(fRawRootReader) delete fRawRootReader; fRawRootReader = new AliRawReaderRoot(filename); @@ -241,7 +241,7 @@ Bool_t AliEveTRDLoaderRaw::GoToEvent(int ev) fEventOld = -1; checkEnd = kFALSE; } else checkEnd = kTRUE; - + do NextEvent(); while(fEventOld != ev && !(checkEnd == kTRUE && fEventOld == 0)); LoadEvent(); gEve->Redraw3D(); @@ -253,7 +253,7 @@ Bool_t AliEveTRDLoaderRaw::GoToEvent(int ev) Bool_t AliEveTRDLoaderRaw::LoadEvent() { Info("LoadEvent()", "Loading ..."); - + static const TEveException eH("AliEveTRDLoader::LoadEvent "); if(fRawRootReader == 0x0) throw(eH + "data file not opened."); @@ -300,13 +300,13 @@ void AliEveTRDLoaderRaw::NextEvent(Bool_t rewindOnEnd) AliEveTRDLoaderSimEditor::AliEveTRDLoaderSimEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) { MakeTitle("AliEveTRDLoaderSim"); - + // "Data selector" group frame TGGroupFrame *fGroupFrame = new TGGroupFrame(this,"Data selector"); fLoadHits = new TGCheckButton(fGroupFrame," Hits"); fLoadHits->Connect("Clicked()", "AliEveTRDLoaderSimEditor", this, "Toggle(=0)"); fGroupFrame->AddFrame(fLoadHits, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); - + fLoadDigits = new TGCheckButton(fGroupFrame," Digits"); fLoadDigits->Connect("Clicked()", "AliEveTRDLoaderSimEditor", this, "Toggle(=1)"); fGroupFrame->AddFrame(fLoadDigits, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); @@ -378,7 +378,7 @@ void AliEveTRDLoaderSimEditor::Toggle(Int_t id) // { // MakeTitle("AliEveTRDLoaderRaw"); // } -// +// // void TRDLoaderRawEditor::SetModel(TObject* obj) // { // Info("SetModel()", ""); diff --git a/EVE/Alieve/AliEveTRDLoaderImp.h b/EVE/Alieve/AliEveTRDLoaderImp.h index 8262457999f..2f3ec4496d0 100644 --- a/EVE/Alieve/AliEveTRDLoaderImp.h +++ b/EVE/Alieve/AliEveTRDLoaderImp.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TRDLoaderImp_H #define ALIEVE_TRDLoaderImp_H @@ -36,40 +36,40 @@ class TGCheckButton; public: AliEveTRDLoaderSim(const Text_t* n="AliEveTRDLoaderSim", const Text_t* t=0); ~AliEveTRDLoaderSim(); - + Bool_t GoToEvent(int ev); Bool_t LoadHits(TTree *tH); Bool_t Open(const char *file, const char *dir="."); - + private: AliRunLoader *fRunLoader; // Run Loader - + ClassDef(AliEveTRDLoaderSim, 1) // Alieve loader for the TRD detector (gAlice) }; - + class AliEveTRDLoaderRaw : public AliEveTRDLoader { public: AliEveTRDLoaderRaw(const Text_t* n="AliEveTRDLoaderRaw", const Text_t* t=0); ~AliEveTRDLoaderRaw(); - + Bool_t GoToEvent(int ev); Bool_t LoadEvent(); Bool_t Open(const char *file, const char *dir="."); void SetDataType(TRDDataTypes type); - + private: void NextEvent(Bool_t rewindOnEnd=kTRUE); - + private: AliRawReaderDate *fRawDateReader; AliRawReaderRoot *fRawRootReader; AliTRDrawData *fRaw; Bool_t fDataRoot; Int_t fEventOld; - + ClassDef(AliEveTRDLoaderRaw, 1) // Alieve loader for the TRD detector (raw) }; @@ -81,11 +81,11 @@ class TGCheckButton; virtual void SetModel(TObject* obj); virtual void Toggle(Int_t id); - + protected: AliEveTRDLoaderSim* fM; TGCheckButton *fLoadHits, *fLoadDigits, *fLoadClusters, *fLoadTracks; - + ClassDef(AliEveTRDLoaderSimEditor,1) // Editor for AliEveTRDLoaderSim }; #endif diff --git a/EVE/Alieve/AliEveTRDLoaderManager.cxx b/EVE/Alieve/AliEveTRDLoaderManager.cxx index 3662738338d..62e095a52d7 100644 --- a/EVE/Alieve/AliEveTRDLoaderManager.cxx +++ b/EVE/Alieve/AliEveTRDLoaderManager.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTRDLoaderManager.h" #include "AliEveTRDLoader.h" @@ -56,7 +56,7 @@ void AliEveTRDLoaderManager::Add(Int_t type, const Text_t *name, const Text_t *t //fChildren.push_back(new AliEveTRDLoaderSim(name, title)); gEve->AddElement(trdl = new AliEveTRDLoaderSim(name, title), this); ((AliEveTRDLoaderSim*)trdl)->FindListTreeItem(gEve->GetListTree())->SetTipText(title); - break; + break; case 1: case 2: case 3: @@ -73,7 +73,7 @@ void AliEveTRDLoaderManager::Add(Int_t type, const Text_t *name, const Text_t *t trdl->SetDataType((TRDDataTypes)type); break; } - + gEve->Redraw3D(); } @@ -144,7 +144,7 @@ AliEveTRDLoaderManagerEditor::AliEveTRDLoaderManagerEditor(const TGWindow* p, In //________________________________________________________ AliEveTRDLoaderManagerEditor::~AliEveTRDLoaderManagerEditor() { - + } @@ -176,7 +176,7 @@ void AliEveTRDLoaderManagerEditor::Add() case 3: type = 1; break; - case 4: + case 4: case 5: type = 2; break; @@ -185,7 +185,7 @@ void AliEveTRDLoaderManagerEditor::Add() break; } - + // horizontal frame TGHorizontalFrame *fHorizontalFrame = new TGHorizontalFrame(fGroupFrame, 264, 26, kHorizontalFrame);//, bg); @@ -200,12 +200,12 @@ void AliEveTRDLoaderManagerEditor::Add() // vall717.fFont = ufont->GetFontHandle(); // vall717.fGraphicsExposures = kFALSE; // uGC = gClient->GetGC(&vall717, kTRUE); - + TGLabel *fLabel717 = new TGLabel(fHorizontalFrame, entry->GetText()->GetString()/*, uGC->GetGC(), ufont->GetFontStruct(), kChildFrame*/);//, bg); fLabel717->SetTextJustify(36); fHorizontalFrame->AddFrame(fLabel717, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); - + Int_t nbutton = fM->fChildren.size(); fRemoveButton = new((*fRemove)[nbutton]) TGTextButton(fHorizontalFrame, "Remove", nbutton); fRemoveButton->SetTextJustify(36); diff --git a/EVE/Alieve/AliEveTRDLoaderManager.h b/EVE/Alieve/AliEveTRDLoaderManager.h index 2d0a553c927..3c078a353f2 100644 --- a/EVE/Alieve/AliEveTRDLoaderManager.h +++ b/EVE/Alieve/AliEveTRDLoaderManager.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TRDLoaderManager_H #define ALIEVE_TRDLoaderManager_H @@ -44,7 +44,7 @@ class TClonesArray; protected: void Add(Int_t type, const Text_t *name, const Text_t *title=0x0); void Remove(Int_t entry); - + ClassDef(AliEveTRDLoaderManager, 1) // Alieve loaders manager for TRD }; @@ -56,10 +56,10 @@ class TClonesArray; virtual void Add(); virtual void Remove(Int_t entry); virtual void SetModel(TObject* obj); - + protected: AliEveTRDLoaderManager* fM; - + private: ULong_t bg; // background color TGComboBox *fSelector; diff --git a/EVE/Alieve/AliEveTRDModule.cxx b/EVE/Alieve/AliEveTRDModule.cxx index 8d0487c6b3c..1811b4dd648 100644 --- a/EVE/Alieve/AliEveTRDModule.cxx +++ b/EVE/Alieve/AliEveTRDModule.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTRDModule.h" #include "AliEveTRDModuleImp.h" @@ -29,7 +29,7 @@ AliEveTRDModule::AliEveTRDModule(const char *typ, Int_t det) : { fLoadHits = kFALSE; fRnrHits = kTRUE; - + fLoadDigits = kFALSE; fRnrDigits = kTRUE; fDigitsLog = kFALSE; @@ -56,7 +56,7 @@ AliEveTRDModule::AliEveTRDModule(const char *typ, Int_t det) : AliEveTRDModuleEditor::AliEveTRDModuleEditor(const TGWindow* p, Int_t width, Int_t height, UInt_t options, Pixel_t back) : TGedFrame(p, width, height, options | kVerticalFrame, back) { MakeTitle("TRD Detector"); - + // "Hits" group frame TGGroupFrame *fGroupFrame615 = new TGGroupFrame(this,"Hits"); fDisplayHits = new TGCheckButton(fGroupFrame615,"Display"); @@ -74,7 +74,7 @@ AliEveTRDModuleEditor::AliEveTRDModuleEditor(const TGWindow* p, Int_t width, Int fGroupFrame615->AddFrame(fHitsColor, new TGLayoutHints(kLHintsLeft | kLHintsCenterX | kLHintsTop | kLHintsCenterY,2,2,2,2)); fHitsColor->Connect("ColorSelected(Pixel_t)", "AliEveTRDModuleEditor", this, "UpdateHits(Pixel_t)"); - + fGroupFrame615->SetLayoutManager(new TGVerticalLayout(fGroupFrame615)); AddFrame(fGroupFrame615, new TGLayoutHints(kLHintsLeft | kLHintsTop | kLHintsCenterY | kLHintsExpandX,2,2,2,2)); @@ -101,10 +101,10 @@ AliEveTRDModuleEditor::AliEveTRDModuleEditor(const TGWindow* p, Int_t width, Int fToggleBox->Connect("Clicked()", "AliEveTRDModuleEditor", this, "ModifyDigitsView()"); fGroupFrame636->AddFrame(fVerticalFrame538, new TGLayoutHints(kLHintsLeft | kLHintsTop,2,2,2,2)); - + TGVertical3DLine *fVertical3DLine773 = new TGVertical3DLine(fGroupFrame636,8,63); fGroupFrame636->AddFrame(fVertical3DLine773, new TGLayoutHints(kLHintsLeft | kLHintsCenterX | kLHintsTop | kLHintsExpandY,2,2,2,2)); - + // vertical frame TGVerticalFrame *fVerticalFrame543 = new TGVerticalFrame(fGroupFrame636,81,47,kVerticalFrame); fThreshold = new TGCheckButton(fVerticalFrame543, "Threshold"); @@ -165,10 +165,10 @@ void AliEveTRDModuleEditor::SetModel(TObject* obj) fM = dynamic_cast(obj); if(AliEveTRDNode *node = dynamic_cast(fM)) node->UpdateNode(); - + fDisplayHits->SetEnabled(fM->fLoadHits); if(fM->fLoadHits) fDisplayHits->SetState( fM->fRnrHits ? kButtonDown : kButtonUp); - + fDisplayDigits->SetEnabled(fM->fLoadDigits); fToggleLog->SetEnabled(fM->fLoadDigits); fToggleBox->SetEnabled(fM->fLoadDigits); @@ -183,10 +183,10 @@ void AliEveTRDModuleEditor::SetModel(TObject* obj) fToggleBox->SetState(fM->fDigitsBox ? kButtonDown : kButtonUp); fThreshold->SetState(fM->kDigitsNeedRecompute ? kButtonDown : kButtonUp); } - + if(fM->fLoadRecPoints) fDisplayClusters->SetState(fM->fRnrRecPoints ? kButtonDown : kButtonUp); else fDisplayClusters->SetEnabled(kFALSE); - + if(fM->fLoadTracklets) fDisplayTracks->SetState(fM->fRnrTracklets ? kButtonDown : kButtonUp); else fDisplayTracks->SetEnabled(kFALSE); } @@ -202,7 +202,7 @@ void AliEveTRDModuleEditor::ModifyDigitsView() void AliEveTRDModuleEditor::SetThreshold(Long_t tres) { if(!fM->fLoadDigits) return; - + fM->fDigitsThreshold = (tres == 0) ? (int)fThresValue->GetNumber():tres; fM->kDigitsNeedRecompute = fThreshold->IsDown(); UpdateChamber(); @@ -216,7 +216,7 @@ void AliEveTRDModuleEditor::UpdateChamber() fM->fRnrHits = kFALSE; if(fDisplayHits->IsDown()) fM->fRnrHits = kTRUE; - + fM->fRnrDigits = kFALSE; if(fDisplayDigits->IsDown()){ fM->fRnrDigits = kTRUE; @@ -225,10 +225,10 @@ void AliEveTRDModuleEditor::UpdateChamber() if(fToggleBox->IsDown()) fM->fDigitsBox = kTRUE; else fM->fDigitsBox = kFALSE; } - + fM->fRnrRecPoints = kFALSE; if(fDisplayClusters->IsDown()) fM->fRnrRecPoints = kTRUE; - + fM->fRnrTracklets = kFALSE; if(fDisplayTracks->IsDown()) fM->fRnrTracklets = kTRUE; @@ -241,7 +241,7 @@ void AliEveTRDModuleEditor::UpdateChamber() void AliEveTRDModuleEditor::UpdateClusters(Pixel_t /*col*/) { // Info("UpdateClusters()",""); -/* +/* if(fM->fRecPoints){ fM->fRecPoints->SetMarkerColor(col ? fHitsColor->GetColor() : col); gEve->Redraw3D(); @@ -253,7 +253,7 @@ void AliEveTRDModuleEditor::UpdateClusters(Pixel_t /*col*/) void AliEveTRDModuleEditor::UpdateHits(Pixel_t /*col*/) { // Info("UpdateHits()",""); -/* +/* if(fM->fHits){ fM->fHits->SetMarkerColor(col ? fClustersColor->GetColor() : col); gEve->Redraw3D(); diff --git a/EVE/Alieve/AliEveTRDModule.h b/EVE/Alieve/AliEveTRDModule.h index 3847595af3d..25881db6683 100644 --- a/EVE/Alieve/AliEveTRDModule.h +++ b/EVE/Alieve/AliEveTRDModule.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TRDModule_H #define ALIEVE_TRDModule_H @@ -42,7 +42,7 @@ class TGColorSelect; public: AliEveTRDModule(const char *typ="XXX", Int_t id=0); virtual ~AliEveTRDModule() {} - + virtual Bool_t GetDigitsBox(){return fDigitsBox;} virtual Bool_t GetDigitsLog(){return fDigitsLog;} virtual UShort_t GetDigitsThreshold(){return fDigitsThreshold;} @@ -58,12 +58,12 @@ class TGColorSelect; Bool_t fLoadRecPoints, fRnrRecPoints; Bool_t fLoadTracklets, fRnrTracklets; - + Int_t fDet; // detector number UShort_t fDigitsThreshold; // digits threshold ClassDef(AliEveTRDModule,1) // Structure holder for TRD chamber }; - + class AliEveTRDModuleEditor : public TGedFrame { @@ -78,7 +78,7 @@ class TGColorSelect; void UpdateChamber(); void UpdateClusters(Pixel_t); void UpdateHits(Pixel_t); - + protected: AliEveTRDModule* fM; @@ -90,7 +90,7 @@ class TGColorSelect; TGCheckButton *fDisplayClusters; TGColorSelect *fClustersColor; TGCheckButton *fDisplayTracks; - + ClassDef(AliEveTRDModuleEditor,1) // Editor for AliEveTRDModule }; #endif diff --git a/EVE/Alieve/AliEveTRDModuleImp.cxx b/EVE/Alieve/AliEveTRDModuleImp.cxx index 00d6a9dd267..df97c5bfd30 100644 --- a/EVE/Alieve/AliEveTRDModuleImp.cxx +++ b/EVE/Alieve/AliEveTRDModuleImp.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTRDModuleImp.h" #include "AliEveTRDData.h" @@ -90,7 +90,7 @@ void AliEveTRDNode::EnableListElements() { SetRnrSelf(kTRUE); AliEveTRDNode *node = 0x0; - AliEveTRDChamber *chmb = 0x0; + AliEveTRDChamber *chmb = 0x0; List_i iter = fChildren.begin(); while(iter != fChildren.end()){ if((node = dynamic_cast(*iter))){ @@ -108,7 +108,7 @@ void AliEveTRDNode::DisableListElements() { SetRnrSelf(kFALSE); AliEveTRDNode *node = 0x0; - AliEveTRDChamber *chmb = 0x0; + AliEveTRDChamber *chmb = 0x0; List_i iter = fChildren.begin(); while(iter != fChildren.end()){ if((node = dynamic_cast(*iter))){ @@ -129,7 +129,7 @@ void AliEveTRDNode::UpdateLeaves() while(iter != fChildren.end()){ module = dynamic_cast(*iter); if(!module) continue; - + module->fRnrHits = fRnrHits; module->fRnrDigits = fRnrDigits; module->fDigitsLog = fDigitsLog; @@ -170,7 +170,7 @@ void AliEveTRDNode::UpdateNode() if(!module) continue; score[0] += (module->fLoadHits) ? 1 : 0; score[1] += (module->fRnrHits) ? 1 : 0; - + score[2] += (module->fLoadDigits) ? 1 : 0; score[3] += (module->fRnrDigits) ? 1 : 0; score[4] += (module->fDigitsLog) ? 1 : 0; @@ -185,7 +185,7 @@ void AliEveTRDNode::UpdateNode() iter++; } - Int_t size = fChildren.size(); + Int_t size = fChildren.size(); fLoadHits = (score[0] > 0) ? kTRUE : kFALSE; fRnrHits = (score[1] == size) ? kTRUE : kFALSE; @@ -214,15 +214,15 @@ AliEveTRDChamber::AliEveTRDChamber(Int_t det) : // // Constructor // - + fDigits = 0x0; fHits = 0x0; fRecPoints = 0x0; fTracklets = 0x0; - + AliTRDCommonParam* parCom = AliTRDCommonParam::Instance(); samplingFrequency = parCom->GetSamplingFrequency(); - + fGeo = 0x0; fPadPlane = 0x0; } @@ -238,7 +238,7 @@ AliEveTRDChamber::AliEveTRDChamber(const AliEveTRDChamber &mod): if(mod.fDigits) {} if(mod.fHits) {} - if(mod.fRecPoints){} + if(mod.fRecPoints){} } //________________________________________________________ @@ -252,7 +252,7 @@ AliEveTRDChamber& AliEveTRDChamber::operator=(const AliEveTRDChamber &mod) fDet = mod.fDet; if(mod.fDigits) {} if(mod.fHits) {} - if(mod.fRecPoints){} + if(mod.fRecPoints){} } return *this; } @@ -283,12 +283,12 @@ void AliEveTRDChamber::LoadClusters(TObjArray *clusters) // // Draw clusters // - + if(!fGeo){ AliError(Form("Geometry not set for chamber %d. Please call first AliEveTRDChamber::SetGeometry().", fDet)); return; } - + if(!fRecPoints){ fRecPoints = new AliEveTRDClusters(this); fRecPoints->SetMarkerSize(1.); @@ -299,7 +299,7 @@ void AliEveTRDChamber::LoadClusters(TObjArray *clusters) Float_t q; Double_t cloc[3], cglo[3]; - + AliTRDcluster *c=0x0; for(int iclus=0; iclusGetEntriesFast(); iclus++){ c = (AliTRDcluster*)clusters->UncheckedAt(iclus); @@ -325,10 +325,10 @@ void AliEveTRDChamber::LoadDigits(AliTRDdigitsManager *digits) return; } // Info("LoadDigits()", Form("digits =0x%x", digits)); - + if(!fDigits) fDigits = new AliEveTRDDigits(this); else fDigits->Reset(); - + fDigits->SetData(digits); fLoadDigits = kTRUE; } @@ -347,7 +347,7 @@ void AliEveTRDChamber::AddHit(AliTRDhit *hit) fHits->SetMarkerColor(2); fHits->SetOwnIds(kTRUE); } - + fHits->SetNextPoint(hit->X(), hit->Y(), hit->Z()); fHits->SetPointId(hit); fLoadHits = kTRUE; @@ -364,12 +364,12 @@ void AliEveTRDChamber::LoadTracklets(TObjArray *tracks) return; } // Info("LoadTracklets()", Form("tracks = 0x%x", tracks)); - + if(!fTracklets){ fTracklets = new std::vector; } else fTracklets->clear(); - - + + AliTRDmcmTracklet *trk = 0x0; Double_t cloc[3], cglo[3]; for(int itrk=0; itrkGetEntries();itrk++){ @@ -377,13 +377,13 @@ void AliEveTRDChamber::LoadTracklets(TObjArray *tracks) trk->MakeTrackletGraph(fGeo,.5); fTracklets->push_back(new TEveTrack()); fTracklets->back()->SetLineColor(4); - + cloc[0] = trk->GetTime0(); // x0 cloc[1] = trk->GetOffset(); // y0 cloc[2] = trk->GetRowz(); // z fGeo->RotateBack(fDet,cloc,cglo); fTracklets->back()->SetNextPoint(cglo[0], cglo[1], cglo[2]); - + cloc[0] += 3.7; // x1 cloc[1] += TMath::Tan(trk->GetSlope()*TMath::Pi()/180.) * 3.7; // y1 fGeo->RotateBack(fDet,cloc,cglo); @@ -436,10 +436,10 @@ void AliEveTRDChamber::Reset() void AliEveTRDChamber::SetGeometry(AliTRDgeometry *geo) { fGeo = geo; - + fPla = fGeo->GetPlane(fDet); fX0 = fGeo->GetTime0(fPla); - + fPadPlane = fGeo->GetPadPlane(fPla,fGeo->GetChamber(fDet)); rowMax = fPadPlane->GetNrows(); colMax = fPadPlane->GetNcols(); diff --git a/EVE/Alieve/AliEveTRDModuleImp.h b/EVE/Alieve/AliEveTRDModuleImp.h index ae43921af57..17174823202 100644 --- a/EVE/Alieve/AliEveTRDModuleImp.h +++ b/EVE/Alieve/AliEveTRDModuleImp.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TRDModuleImp_H #define ALIEVE_TRDModuleImp_H @@ -13,7 +13,7 @@ // // Implementation of AliEveTRDModule: // - AliEveTRDChamber - Data holder -// - AliEveTRDNode - Node structure +// - AliEveTRDNode - Node structure // // by A.Bercuci (A.Bercuci@gsi.de) Fri Oct 27 2006 ///////////////////////////////////////////////////////////////////////// @@ -42,13 +42,13 @@ class TEveTrack; { friend class AliEveTRDDigits; public: - + AliEveTRDChamber(Int_t det=0); virtual ~AliEveTRDChamber() {} - + AliEveTRDChamber(const AliEveTRDChamber&); AliEveTRDChamber& operator=(const AliEveTRDChamber&); - + void AddHit(AliTRDhit *hit); Int_t GetRowMax() const {return rowMax;} Int_t GetColMax() const {return colMax;} @@ -62,7 +62,7 @@ class TEveTrack; void Paint(Option_t* option=""); void Reset(); void SetGeometry(AliTRDgeometry *geo); - + protected: AliEveTRDDigits *fDigits; // digits representation AliEveTRDHits *fHits; // hits representation @@ -78,11 +78,11 @@ class TEveTrack; Int_t fPla; // detector plane AliTRDpadPlane *fPadPlane; // pad plane object AliTRDgeometry *fGeo; // TRD geometry - + ClassDef(AliEveTRDChamber,1) // Holder for TRD chamber data }; - + class AliEveTRDNode : public TEveElement, public AliEveTRDModule { public: @@ -96,10 +96,10 @@ class TEveTrack; void DisableListElements(); // *MENU* void UpdateLeaves(); void UpdateNode(); - + List_i begin(){return fChildren.begin();} List_i end(){return fChildren.end();} - + ClassDef(AliEveTRDNode, 1) }; #endif diff --git a/EVE/Alieve/AliEveTrackFitter.cxx b/EVE/Alieve/AliEveTrackFitter.cxx index 8da24f9b86b..c4ae3948034 100644 --- a/EVE/Alieve/AliEveTrackFitter.cxx +++ b/EVE/Alieve/AliEveTrackFitter.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTrackFitter.h" @@ -30,7 +30,7 @@ // points, listening to signal PointCtrlClicked() of any // TEvePointSet. Via editor it fits selected points and creates a // reconstructed track. -// +// ClassImp(AliEveTrackFitter) @@ -52,7 +52,7 @@ AliEveTrackFitter::AliEveTrackFitter(const Text_t* name, Int_t n_points) : fGraphSelected = new TGraph(); fGraphSelected->SetName("Selected points"); fGraphSelected->SetMarkerColor(4); - fGraphSelected->SetMarkerStyle(4); + fGraphSelected->SetMarkerStyle(4); fGraphSelected->SetMarkerSize(2); fGraphFitted = new TGraphErrors(); @@ -118,9 +118,9 @@ void AliEveTrackFitter::Stop() /**************************************************************************/ void AliEveTrackFitter::AddFitPoint(TEvePointSet* ps, Int_t n) -{ +{ // Add/remove given point depending if exists in the fMapPS. - + Float_t x, y, z; std::map::iterator g = fMapPS.find(Point_t(ps, n)); @@ -135,11 +135,11 @@ void AliEveTrackFitter::AddFitPoint(TEvePointSet* ps, Int_t n) fMapPS.erase(g); fLastPoint--; } - else + else { fMapPS[Point_t(ps, n)] = Size(); ps->GetPoint(n, x, y, z); - SetNextPoint(x, y, z); + SetNextPoint(x, y, z); SetPointId(ps->GetPointId(n)); } ResetBBox(); @@ -174,8 +174,8 @@ void AliEveTrackFitter::FitTrack() GetPoint(alphaIdx, x, y, z); fAlpha = ATan2(y, x); Float_t sin = Sin(-fAlpha); - Float_t cos = Cos(-fAlpha); - for (Int_t i=0; i<=fLastPoint; i++) { + Float_t cos = Cos(-fAlpha); + for (Int_t i=0; i<=fLastPoint; i++) { GetPoint(i, x, y, z); fRieman->AddPoint(cos*x - sin*y, cos*y + sin*x, z, 1, 1); } @@ -198,7 +198,7 @@ void AliEveTrackFitter::FitTrack() Double_t P0[3]; trackParam.GetPxPyPzAt(r, TEveTrackPropagator::fgDefMagField, P0); TEveRecTrack rc; - rc.fV.Set(AliEveV0); + rc.fV.Set(AliEveV0); rc.fP.Set(P0); rc.fSign = trackParam.Charge(); @@ -209,11 +209,11 @@ void AliEveTrackFitter::FitTrack() { GetPoint(i, x, y, z); pm->fV.Set(x, y, z); - pm->fP.Set(P0); + pm->fP.Set(P0); track->AddPathMark(pm); } track->MakeTrack(); - track->SetAttLineAttMarker(fTrackList); + track->SetAttLineAttMarker(fTrackList); gEve->AddElement(track, fTrackList); } @@ -241,7 +241,7 @@ void AliEveTrackFitter::DrawRiemanGraph() fGraphSelected->Set(nR); fGraphFitted->Set(nR); - Double_t* x = fRieman->GetX(); + Double_t* x = fRieman->GetX(); Double_t* y = fRieman->GetY(); Double_t* sy = fRieman->GetSy(); for (Int_t i=0; iSetPoint(i, x[i], fRieman->GetYat(x[i])); fGraphFitted->SetPointError(i, 0.1, sy[i]); } - + if (gPad) gPad->Clear(); fGraphSelected->Draw("AP"); fGraphFitted->Draw("SAME P"); diff --git a/EVE/Alieve/AliEveTrackFitter.h b/EVE/Alieve/AliEveTrackFitter.h index c29d0e48349..844a3313898 100644 --- a/EVE/Alieve/AliEveTrackFitter.h +++ b/EVE/Alieve/AliEveTrackFitter.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TrackFitter_H @@ -36,7 +36,7 @@ protected: // inner structure to check duplicates TEvePointSet* fPS; // selected pointset Int_t fIdx; // location in the point set array - Point_t(TEvePointSet* ps, Int_t i): fPS(ps), fIdx(i){} + Point_t(TEvePointSet* ps, Int_t i): fPS(ps), fIdx(i){} bool operator<(const Point_t& o) const { if (fPS != o.fPS) return fPS < o.fPS; return fIdx < o.fIdx; } }; @@ -44,15 +44,15 @@ protected: Float_t fAlpha; // transformation agle to local system (where x>>y) AliRieman* fRieman; // rieman fitter - Bool_t fConnected; // object connected to pointset Ctrl-shift signal - - TEveTrackList* fTrackList; // track list created with rieman fit + Bool_t fConnected; // object connected to pointset Ctrl-shift signal + + TEveTrackList* fTrackList; // track list created with rieman fit std::map fMapPS; // map of selected points from different TEvePointSet public: AliEveTrackFitter(const Text_t* name, Int_t n_points=0); virtual ~AliEveTrackFitter(); - + virtual void AddFitPoint(TEvePointSet*,Int_t); // slot for PointCtrlClicked() signal virtual void DestroyElements(); // *MENU* diff --git a/EVE/Alieve/AliEveTrackFitterEditor.cxx b/EVE/Alieve/AliEveTrackFitterEditor.cxx index fa7b0e940f0..3ca3452d79e 100644 --- a/EVE/Alieve/AliEveTrackFitterEditor.cxx +++ b/EVE/Alieve/AliEveTrackFitterEditor.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveTrackFitterEditor.h" @@ -62,7 +62,7 @@ AliEveTrackFitterEditor::AliEveTrackFitterEditor(const TGWindow *p, Int_t width, /**************************************************************************/ void AliEveTrackFitterEditor::SetModel(TObject* obj) -{ +{ // Set model object. fM = dynamic_cast(obj); @@ -73,7 +73,7 @@ void AliEveTrackFitterEditor::SetModel(TObject* obj) fStop->SetState(kButtonUp); } else - { + { fStop->SetState(kButtonDisabled); fStart->SetState(kButtonEngaged); fStart->SetState(kButtonUp); diff --git a/EVE/Alieve/AliEveTrackFitterEditor.h b/EVE/Alieve/AliEveTrackFitterEditor.h index 086bb82c19f..df9dc53c03e 100644 --- a/EVE/Alieve/AliEveTrackFitterEditor.h +++ b/EVE/Alieve/AliEveTrackFitterEditor.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_TrackFitterEditor_H @@ -42,7 +42,7 @@ public: void DoStart(); void DoFit(); - void DoReset(); + void DoReset(); void DoStop(); void DoGraph(); diff --git a/EVE/Alieve/AliEveVSDCreator.cxx b/EVE/Alieve/AliEveVSDCreator.cxx index c3ca35eaab5..aa43c3a8f57 100644 --- a/EVE/Alieve/AliEveVSDCreator.cxx +++ b/EVE/Alieve/AliEveVSDCreator.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "AliEveVSDCreator.h" @@ -50,7 +50,7 @@ AliEveVSDCreator::AliEveVSDCreator(const Text_t* name, const Text_t* title) : mKineType (KT_Standard), mDataDir ("."), mEvent (0), - + mTPCHitRes (2), mTRDHitRes (2), @@ -82,7 +82,7 @@ AliEveVSDCreator::AliEveVSDCreator(const Text_t* name, const Text_t* title) : 0,2,"Ion",kion+20030); } - // AliKalmanTrack::SetConvConst(1); + // AliKalmanTrack::SetConvConst(1); } /**************************************************************************/ @@ -96,7 +96,7 @@ void AliEveVSDCreator::CreateVSD(const Text_t* data_dir, Int_t event, mEvent = event; string galice_file (Form("%s/galice.root", mDataDir.Data())); - + if(mDebugLevel > 0) printf("%s opening %s \n", eH.Data(), galice_file.c_str()); @@ -138,7 +138,7 @@ void AliEveVSDCreator::CreateVSD(const Text_t* data_dir, Int_t event, file->Write(); file->Close(); - delete file; + delete file; fDirectory =0; //GledNS::PopFD(); @@ -229,7 +229,7 @@ void AliEveVSDCreator::ConvertKinematics() { static const TEveException eH("AliEveVSDCreator::ConvertKinematics "); - if(fTreeK != 0) + if(fTreeK != 0) throw (eH + "kinematics already converted"); AliStack* stack = pRunLoader->Stack(); @@ -238,7 +238,7 @@ void AliEveVSDCreator::ConvertKinematics() fDirectory->cd(); fTreeK = new TTree("Kinematics", "TParticles sorted by Label"); - + Int_t nentries = stack->GetNtrack(); vector vmc(nentries); for (Int_t idx=0; idxGetEntry(%d) \n",iPrimPart); fTreeTR->GetEntry(iPrimPart); // printf("END fTreeTR->GetEntry(%d) \n",iPrimPart); - + for (Int_t iTrackRef = 0; iTrackRef < RunArrayTR->GetEntriesFast(); iTrackRef++) { - AliTrackReference *trackRef = (AliTrackReference*)RunArrayTR->At(iTrackRef); + AliTrackReference *trackRef = (AliTrackReference*)RunArrayTR->At(iTrackRef); Int_t track = trackRef->GetTrack(); - if(track < nentries && track > 0){ - TEveMCTrack& mct = vmc[track]; + if(track < nentries && track > 0){ + TEveMCTrack& mct = vmc[track]; if(trackRef->TestBit(kNotDeleted)) { mct.decayed = true; mct.t_decay = trackRef->GetTime(); @@ -281,7 +281,7 @@ void AliEveVSDCreator::ConvertKinematics() if(TMath::Abs(mct.GetPdgCode()) == 11) mct.decayed = false; // a bug in TreeTR } - } + } } } } @@ -319,7 +319,7 @@ void AliEveVSDCreator::ConvertKinematics() namespace { - struct Detector + struct Detector { const char* name; const char* hitbranch; @@ -348,7 +348,7 @@ void AliEveVSDCreator::ConvertHits() fDirectory->cd(); fTreeH = new TTree("Hits", "Combined detector hits."); fTreeH->Branch("H", "TEveHit", &fpH, fBuffSize); - + map hmap; // parameters for ITS, TPC hits filtering Float_t x,y,z, x1,y1,z1; @@ -361,14 +361,14 @@ void AliEveVSDCreator::ConvertHits() Detector& det = detects[l++]; switch(det.detidx) { - case 1: { + case 1: { Int_t count = 0; TTree* treeh = pRunLoader->GetTreeH(det.name, false); if(treeh == 0) { Warning(eH, Form("no hits for %s.", det.name)); continue; } - AliTPCTrackHitsV2 hv2, *_hv2=&hv2; + AliTPCTrackHitsV2 hv2, *_hv2=&hv2; treeh->SetBranchAddress("TPC2", &_hv2); Int_t np = treeh->GetEntries(); for(Int_t i=0; iSetBranchAddress(det.name, &arr); Int_t np = treeh->GetEntries(); // in TreeH files hits are grouped in clones arrays - // each eva particle has its own clone array + // each eva particle has its own clone array for (Int_t i=0; iGetEntry(i); Int_t eva_idx = np -i -1; @@ -424,17 +424,17 @@ void AliEveVSDCreator::ConvertHits() x1=ali_hit->X();y1=ali_hit->Y();z1=ali_hit->Z(); if((x-x1)*(x-x1)+(y-y1)*(y-y1)+(z-z1)*(z-z1) < trd_sqr_res) continue; x=x1; y=y1; z=z1; - } + } hmap[fH.fLabel]++; - fTreeH->Fill(); + fTreeH->Fill(); } } delete arr; break; - } // end default + } // end default } // end switch } // end while - + //set geninfo for(map::iterator j=hmap.begin(); j!=hmap.end(); ++j) { @@ -472,11 +472,11 @@ void AliEveVSDCreator::ConvertTPCClusters() { static const TEveException eH("AliEveVSDCreator::ConvertTPCClusters "); - auto_ptr f + auto_ptr f ( TFile::Open(Form("%s/TPC.RecPoints.root", mDataDir.Data())) ); if(!f.get()) throw(eH + "can not open 'TPC.RecPoints.root' file."); - + auto_ptr d ( (TDirectory*) f->Get(Form("AliEveEventManager%d", mEvent)) ); if(!d.get()) @@ -501,7 +501,7 @@ void AliEveVSDCreator::ConvertTPCClusters() nClusters += _clrow->GetArray()->GetEntriesFast(); } - // calculate xyz for a cluster and add it to container + // calculate xyz for a cluster and add it to container Double_t x,y,z; Float_t cs, sn, tmp; map cmap; @@ -511,7 +511,7 @@ void AliEveVSDCreator::ConvertTPCClusters() Int_t ncl = _clrow->GetArray()->GetEntriesFast(); if(ncl > 0) { Int_t sec,row; - par->AdjustSectorRow(_clrow->GetID(),sec,row); + par->AdjustSectorRow(_clrow->GetID(),sec,row); while (ncl--) { if(_clrow->GetArray()) { // cl = new AliTPCclusterMI(*(AliTPCclusterMI*)_clrow->GetArray()->UncheckedAt(ncl)); @@ -520,7 +520,7 @@ void AliEveVSDCreator::ConvertTPCClusters() { x = par->GetPadRowRadii(sec,row); y = cl->GetY(); z = cl->GetZ(); par->AdjustCosSin(sec,cs,sn); - tmp = x*cs-y*sn; y= x*sn+y*cs; x=tmp; + tmp = x*cs-y*sn; y= x*sn+y*cs; x=tmp; fC.fDetId = 1; fC.fSubdetId = 0; @@ -552,11 +552,11 @@ void AliEveVSDCreator::ConvertITSClusters() { static const TEveException eH("AliEveVSDCreator::ConvertITSClusters "); - auto_ptr f + auto_ptr f ( TFile::Open(Form("%s/ITS.RecPoints.root", mDataDir.Data())) ); if(!f.get()) throw(eH + "can not open 'ITS.RecPoints.root' file."); - + auto_ptr d ( (TDirectory*) f->Get(Form("AliEveEventManager%d", mEvent)) ); if(!d.get()) @@ -589,12 +589,12 @@ void AliEveVSDCreator::ConvertITSClusters() for (Int_t j=0; jUncheckedAt(j); - Double_t rot[9]; + Double_t rot[9]; geom->GetRotMatrix(mod,rot); - Int_t lay,lad,det; + Int_t lay,lad,det; geom->GetModuleId(mod,lay,lad,det); - Float_t tx,ty,tz; - geom->GetTrans(lay,lad,det,tx,ty,tz); + Float_t tx,ty,tz; + geom->GetTrans(lay,lad,det,tx,ty,tz); Double_t alpha=TMath::ATan2(rot[1],rot[0])+TMath::Pi(); Double_t phi1=TMath::Pi()/2+alpha; @@ -619,7 +619,7 @@ void AliEveVSDCreator::ConvertITSClusters() while(i < 3 && fC.fLabel[i]) cmap[fC.fLabel[i++]]++; } - } + } for(map::iterator j=cmap.begin(); j!=cmap.end(); ++j) { GetGeninfo(j->first)->fNClus += j->second; @@ -643,22 +643,22 @@ void AliEveVSDCreator::ConvertRecTracks() fTreeR = new TTree("RecTracks", "rec tracks"); fTreeR->Branch("R", "TEveRecTrack", &fpR, 512*1024,1); - + TFile f(Form("%s/AliESDs.root", mDataDir.Data())); if(!f.IsOpen()) throw(eH + "no AliESDs.root file."); TTree* tree = (TTree*) f.Get("esdTree"); - if (tree == 0) + if (tree == 0) throw(eH + "no esdTree."); - - AliESDEvent *fEvent= new AliESDEvent(); + + AliESDEvent *fEvent= new AliESDEvent(); fEvent->ReadFromTree(tree); - tree->GetEntry(mEvent); + tree->GetEntry(mEvent); if(fEvent->GetAliESDOld())fEvent->CopyFromOldESD(); - + // reconstructed tracks AliESDtrack* esd_t; Double_t dbuf[3]; @@ -698,12 +698,12 @@ void AliEveVSDCreator::ConvertV0() } TTree* tree = (TTree*) f.Get("esdTree"); - if (tree == 0) + if (tree == 0) throw(eH + "no esdTree."); - AliESDEvent *fEvent= new AliESDEvent(); + AliESDEvent *fEvent= new AliESDEvent(); fEvent->ReadFromTree(tree); - tree->GetEntry(mEvent); + tree->GetEntry(mEvent); if(fEvent->GetAliESDOld())fEvent->CopyFromOldESD(); for (Int_t n =0; n< fEvent->GetNumberOfV0s(); n++) @@ -717,10 +717,10 @@ void AliEveVSDCreator::ConvertV0() fV0.fStatus = av->GetStatus(); // Point of closest approach av->GetXYZ(pos[0],pos[1],pos[2]); - fV0.fVCa.fX = pos[0]; + fV0.fVCa.fX = pos[0]; fV0.fVCa.fY = pos[1]; fV0.fVCa.fZ = pos[2]; - // set birth vertex of neutral particle + // set birth vertex of neutral particle av->GetXYZ(pos[0], pos[1], pos[2]); fV0.fV0Birth.Set(pos); @@ -743,7 +743,7 @@ void AliEveVSDCreator::ConvertV0() fV0.fDLabel[0] = TMath::Abs(trackN->GetLabel()); fV0.fDLabel[1] = TMath::Abs(trackP->GetLabel()); - // printf("AliEveV0 convert labels(%d,%d) index(%d,%d)\n", + // printf("AliEveV0 convert labels(%d,%d) index(%d,%d)\n", // fV0.d_label[0], fV0.d_label[1], // av->GetNIndex(), av->GetPIndex()); @@ -773,13 +773,13 @@ void AliEveVSDCreator::ConvertKinks() } TTree* tree = (TTree*) f.Get("esdTree"); - if (tree == 0) + if (tree == 0) throw(eH + "no esdTree."); - AliESDEvent *fEvent= new AliESDEvent(); + AliESDEvent *fEvent= new AliESDEvent(); fEvent->ReadFromTree(tree); - tree->GetEntry(mEvent); + tree->GetEntry(mEvent); if(fEvent->GetAliESDOld())fEvent->CopyFromOldESD(); @@ -797,7 +797,7 @@ void AliEveVSDCreator::ConvertKinks() fKK.fVKink.Set(kk->GetPosition()); const AliExternalTrackParam& tp_mother = kk->RefParamMother(); - // momentum and position of mother + // momentum and position of mother tp_mother.GetPxPyPz(pos); fKK.fP.Set(pos); tp_mother.GetXYZ(pos); @@ -805,9 +805,9 @@ void AliEveVSDCreator::ConvertKinks() const Double_t* par = tp_mother.GetParameter(); // printf("KINK Pt %f, %f \n",1/tp_mother.Pt(),par[4] ); fKK.fSign = (par[4] < 0) ? -1 : 1; - + const AliExternalTrackParam& tp_daughter = kk->RefParamDaughter(); - // momentum and position of daughter + // momentum and position of daughter tp_daughter.GetPxPyPz(pos); fKK.fPSec.Set(pos); tp_daughter.GetXYZ(pos); @@ -844,7 +844,7 @@ void AliEveVSDCreator::ConvertGenInfo() if (fTreeR) { Int_t re = fTreeR->GetEntryNumberWithIndex(j->first); - if(re != -1) + if(re != -1) fGI.fIsRec = true; } // Int_t has_v0 = fTreeV0->GetEntryNumberWithIndex(j->first); diff --git a/EVE/Alieve/AliEveVSDCreator.h b/EVE/Alieve/AliEveVSDCreator.h index 5ef4ea12a86..c91bf5e7ddd 100644 --- a/EVE/Alieve/AliEveVSDCreator.h +++ b/EVE/Alieve/AliEveVSDCreator.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_VSDCreator_H @@ -35,8 +35,8 @@ protected: TString mDataDir; // X{G} Int_t mEvent; // X{G} - Float_t mTPCHitRes; // X{gs} - Float_t mTRDHitRes; // X{gs} + Float_t mTPCHitRes; // X{gs} + Float_t mTRDHitRes; // X{gs} Int_t mDebugLevel; @@ -47,7 +47,7 @@ public: virtual ~AliEveVSDCreator() {} void CreateVSD(const Text_t* data_dir, Int_t event, - const Text_t* vsd_file); // X{Ed} + const Text_t* vsd_file); // X{Ed} void CreateTrees(); diff --git a/EVE/Alieve/LinkDef.h b/EVE/Alieve/LinkDef.h index 8a063bda50c..20347613b7b 100644 --- a/EVE/Alieve/LinkDef.h +++ b/EVE/Alieve/LinkDef.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #pragma link off all functions; #pragma link off all globals; diff --git a/EVE/Alieve/alieve_main/alieve_main.cxx b/EVE/Alieve/alieve_main/alieve_main.cxx index be4e67f2474..d79c5576b32 100644 --- a/EVE/Alieve/alieve_main/alieve_main.cxx +++ b/EVE/Alieve/alieve_main/alieve_main.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include #include diff --git a/EVE/Alieve/blacklisted-classes/AliEveCascade.cxx b/EVE/Alieve/blacklisted-classes/AliEveCascade.cxx index 5cd3207027f..4ed5c244ee9 100644 --- a/EVE/Alieve/blacklisted-classes/AliEveCascade.cxx +++ b/EVE/Alieve/blacklisted-classes/AliEveCascade.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ /************************************************************************** * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * @@ -185,49 +185,49 @@ void AliEveCascade::MakeTrack(vpPathMark_t& pathMark, TEveVector& vtx, TEveVect TEveTrackPropagator& RS((fRnrStyle != 0) ? *fRnrStyle : TEveTrackPropagator::fgDefStyle); - Float_t px = p.x, py = p.y, pz = p.z; + Float_t px = p.x, py = p.y, pz = p.z; MCVertex mc_v0; mc_v0.x = vtx.x; - mc_v0.y = vtx.y; - mc_v0.z = vtx.z; + mc_v0.y = vtx.y; + mc_v0.z = vtx.z; mc_v0.t = 0; std::vector track_points; Bool_t decay = kFALSE; - if ((TMath::Abs(vtx.z) > RS.fMaxZ) || (vtx.x*vtx.x + vtx.y*vtx.y > RS.fMaxR*RS.fMaxR)) + if ((TMath::Abs(vtx.z) > RS.fMaxZ) || (vtx.x*vtx.x + vtx.y*vtx.y > RS.fMaxR*RS.fMaxR)) goto make_polyline; - + if (TMath::Abs(RS.fMagField) > 1e-5) { // Charged particle in magnetic field Float_t a = RS.fgkB2C * RS.fMagField * charge; - + MCHelix helix(fRnrStyle, &mc_v0, TMath::C()*beta, &track_points, a); //m->cm helix.Init(TMath::Sqrt(px*px+py*py), pz); - + if(!pathMark.empty()){ for(std::vector::iterator i=pathMark.begin(); i!=pathMark.end(); ++i) { TEvePathMark* pm = *i; - + if(RS.fFitDaughters && pm->type == TEvePathMark::Daughter){ - if(TMath::Abs(pm->V.z) > RS.fMaxZ + if(TMath::Abs(pm->V.z) > RS.fMaxZ || TMath::Sqrt(pm->V.x*pm->V.x + pm->V.y*pm->V.y) > RS.fMaxR ) goto helix_bounds; - //printf("%s fit daughter \n", fName.Data()); + //printf("%s fit daughter \n", fName.Data()); helix.LoopToVertex(p.x, p.y, p.z, pm->V.x, pm->V.y, pm->V.z); p.x -= pm->P.x; p.y -= pm->P.y; p.z -= pm->P.z; } if(RS.fFitDecay && pm->type == TEvePathMark::Decay){ - - if(TMath::Abs(pm->V.z) > RS.fMaxZ + + if(TMath::Abs(pm->V.z) > RS.fMaxZ || TMath::Sqrt(pm->V.x*pm->V.x + pm->V.y*pm->V.y) > RS.fMaxR ) goto helix_bounds; helix.LoopToVertex(p.x, p.y, p.z, pm->V.x, pm->V.y, pm->V.z); @@ -248,14 +248,14 @@ void AliEveCascade::MakeTrack(vpPathMark_t& pathMark, TEveVector& vtx, TEveVect // Neutral particle or no field MCLine line(fRnrStyle, &mc_v0, TMath::C()*beta, &track_points); - + if(!pathMark.empty()) { for(std::vector::iterator i=pathMark.begin(); i!=pathMark.end(); ++i) { TEvePathMark* pm = *i; if(RS.fFitDaughters && pm->type == TEvePathMark::Daughter){ - if(TMath::Abs(pm->V.z) > RS.fMaxZ + if(TMath::Abs(pm->V.z) > RS.fMaxZ || TMath::Sqrt(pm->V.x*pm->V.x + pm->V.y*pm->V.y) > RS.fMaxR ) goto line_bounds; line.GotoVertex(pm->V.x, pm->V.y, pm->V.z); @@ -265,7 +265,7 @@ void AliEveCascade::MakeTrack(vpPathMark_t& pathMark, TEveVector& vtx, TEveVect } if(RS.fFitDecay && pm->type == TEvePathMark::Decay){ - if(TMath::Abs(pm->V.z) > RS.fMaxZ + if(TMath::Abs(pm->V.z) > RS.fMaxZ || TMath::Sqrt(pm->V.x*pm->V.x + pm->V.y*pm->V.y) > RS.fMaxR ) goto line_bounds; line.GotoVertex(pm->V.x, pm->V.y, pm->V.z); @@ -291,7 +291,7 @@ make_polyline: //______________________________________________________________________ void AliEveCascade::MakeV0path() { - + MCVertex mc_v0; mc_v0.x = (fV_neg.x+fV_pos.x)/2; mc_v0.y = (fV_neg.y+fV_pos.y)/2; @@ -313,7 +313,7 @@ void AliEveCascade::MakeV0path() { //______________________________________________________________________ void AliEveCascade::MakeCasPath() { - + MCVertex mc_v0; mc_v0.x = fV_birth.x; mc_v0.y = fV_birth.y; @@ -343,7 +343,7 @@ void AliEveCascade::MakeCascade() MakeTrack(fPathMarksPos, fV_pos, fP_pos, 1, fBeta_pos, fPolyLinePos); if (fBeta_bach>0) MakeTrack(fPathMarksBach, fV_bach, fP_bach, 1, fBeta_bach, fPolyLineBach); - else + else MakeTrack(fPathMarksBach, fV_bach, fP_bach, -1, -fBeta_bach, fPolyLineBach); MakeV0path(); MakeCasPath(); @@ -378,9 +378,9 @@ Float_t AliEveCascade::GetCasPtArmenteros() const Float_t px = GetPx(), py = GetPy(), pz = GetPz(); Float_t p2 = px*px + py*py + pz*pz; if (p2 < 1.e-39) return -999; - + Float_t posXcas, posP2; - + if (fBeta_bach>0) { posXcas = fP_bach.x*px + fP_bach.y*py + fP_bach.z*pz; posP2 = GetBachP2(); @@ -619,7 +619,7 @@ void CascadeList::AdjustHist(Int_t iHist) { if ((iHist<0)||(iHist>=fgkNcutVar)) return; if (! fHist[iHist]) return; - + TString name = fHist[iHist]->GetName(); Int_t nBin = fHist[iHist]->GetXaxis()->GetNbins(); delete fHist[iHist]; @@ -759,7 +759,7 @@ void CascadeList::FilterAll() { for (Int_t i=0; iReset(); - + AliEveCascade* myCas; for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) { diff --git a/EVE/Alieve/blacklisted-classes/AliEveCascade.h b/EVE/Alieve/blacklisted-classes/AliEveCascade.h index f94fb1c2632..be6722d5a31 100644 --- a/EVE/Alieve/blacklisted-classes/AliEveCascade.h +++ b/EVE/Alieve/blacklisted-classes/AliEveCascade.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_Cascade_H #define ALIEVE_Cascade_H @@ -79,7 +79,7 @@ protected: static const Float_t fgkMassProton2; static const Float_t fgkMassLambda2; -public: +public: AliEveCascade(); AliEveCascade(TEveTrackPropagator* rs); virtual ~AliEveCascade(); @@ -127,8 +127,8 @@ public: void SetBachP(Float_t px, Float_t py, Float_t pz) {fP_bach.x = px; fP_bach.y = py; fP_bach.z = pz;} void SetV0vtx(Float_t vx, Float_t vy, Float_t vz) { - fV_neg.x = vx; fV_neg.y = vy; fV_neg.z = vz; - fV_pos.x = vx; fV_pos.y = vy; fV_pos.z = vz; + fV_neg.x = vx; fV_neg.y = vy; fV_neg.z = vz; + fV_pos.x = vx; fV_pos.y = vy; fV_pos.z = vz; } void SetCascadeVtx(Float_t vx, Float_t vy, Float_t vz) { fV_decay.x = vx; fV_decay.y = vy; fV_decay.z = vz; } @@ -399,7 +399,7 @@ public: virtual void Paint(Option_t* option=""); void SetRnrStyle(TEveTrackPropagator* rst) { fRnrStyle= rst; } - TEveTrackPropagator* GetPropagator() { return fRnrStyle; } + TEveTrackPropagator* GetPropagator() { return fRnrStyle; } Bool_t GetRnrCasVtx() const { return fRnrCasVtx; } Bool_t GetRnrCasPath() const { return fRnrCasPath; } diff --git a/EVE/Alieve/blacklisted-classes/AliEveCascadeEditors.cxx b/EVE/Alieve/blacklisted-classes/AliEveCascadeEditors.cxx index 2158db1ee69..79a45a2b77e 100644 --- a/EVE/Alieve/blacklisted-classes/AliEveCascadeEditors.cxx +++ b/EVE/Alieve/blacklisted-classes/AliEveCascadeEditors.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ /*********************************************************************** @@ -56,9 +56,9 @@ CascadeListEditor::CascadeListEditor(const TGWindow *p, fMainTabB(0) { MakeTitle("CascadeList"); - + //TGHorizontalFrame* frame = new TGHorizontalFrame(this); - + // --- Rendering control fRnrVtx = new TGCheckButton(this, "Render v0 and cascade vertices"); @@ -69,12 +69,12 @@ CascadeListEditor::CascadeListEditor(const TGWindow *p, fRnrV0path = new TGCheckButton(this, "Render v0 path"); AddFrame(fRnrV0path, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); fRnrV0path->Connect("Toggled(Bool_t)", - "CascadeListEditor", this, "DoRnrV0path()"); + "CascadeListEditor", this, "DoRnrV0path()"); fRnrCasPath = new TGCheckButton(this, "Render cascade path"); AddFrame(fRnrCasPath, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); fRnrCasPath->Connect("Toggled(Bool_t)", - "CascadeListEditor", this, "DoRnrCasPath()"); + "CascadeListEditor", this, "DoRnrCasPath()"); fRnrV0Daughters = new TGCheckButton(this, "Render v0 daughter tracks"); AddFrame(fRnrV0Daughters, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); @@ -85,7 +85,7 @@ CascadeListEditor::CascadeListEditor(const TGWindow *p, AddFrame(fRnrBach, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); fRnrBach->Connect("Toggled(Bool_t)", "CascadeListEditor", this, "DoRnrBach()"); - + for (Int_t i=0; iSetTicks(1,0); c1->SetGrid(); c1->SetBorderMode(0); - + frameTab->AddFrame(*embeddedCanvas, new TGLayoutHints(kLHintsTop|kLHintsExpandX, 0, 0, 0, 0)); return frameTab; @@ -159,7 +159,7 @@ TGCompositeFrame** CascadeListEditor::CreateTab(TGTab **pMainTab, TGTab **ptab, // container of "Tab1" TGCompositeFrame *frameTab1 = pMainTab[0]->AddTab("ident."); frameTab1->SetLayoutManager(new TGVerticalLayout(frameTab1)); - + // tab widget ptab[0] = new TGTab(frameTab1,2,2); ptab[0]->Resize(ptab[0]->GetDefaultSize()); @@ -167,23 +167,23 @@ TGCompositeFrame** CascadeListEditor::CreateTab(TGTab **pMainTab, TGTab **ptab, // (it updates every canvas) ptab[0]->Connect("Selected(Int_t)", "CascadeListEditor", this, "UpdateSelectedTab()"); frameTab1->AddFrame(ptab[0], new TGLayoutHints(kLHintsLeft| kLHintsExpandX,0,0,0,0)); - + //------ // container of "Tab2" TGCompositeFrame *frameTab2 = pMainTab[0]->AddTab("cascade"); frameTab2->SetLayoutManager(new TGVerticalLayout(frameTab2)); - + // tab widget ptab[1] = new TGTab(frameTab2,440,299); ptab[1]->Resize(ptab[1]->GetDefaultSize()); ptab[1]->Connect("Selected(Int_t)", "CascadeListEditor", this, "UpdateSelectedTab()"); frameTab2->AddFrame(ptab[1], new TGLayoutHints(kLHintsLeft| kLHintsExpandX ,0,0,0,0)); - + //------ // container of "Tab3" TGCompositeFrame *frameTab3 = pMainTab[0]->AddTab("V0daugh/bach."); frameTab3->SetLayoutManager(new TGVerticalLayout(frameTab3)); - + // tab widget ptab[2] = new TGTab(frameTab3,440,299); ptab[2]->Resize(ptab[2]->GetDefaultSize()); @@ -192,7 +192,7 @@ TGCompositeFrame** CascadeListEditor::CreateTab(TGTab **pMainTab, TGTab **ptab, //------ TGCompositeFrame **frameTab = new TGCompositeFrame*[fgkNCanvas]; - + frameTab[0] = AddTab(ptab[0], 0, can, "Xi"); frameTab[1] = AddTab(ptab[0], 1, can, "Omega"); frameTab[2] = AddTab(ptab[0], 2, can, "Arm.Podo."); @@ -269,7 +269,7 @@ void CascadeListEditor::AddValuator(TGCompositeFrame* frame, char *name, //_________________________________________________________________________ void CascadeListEditor::AddSelectTab() { - + TGCompositeFrame** tab = CreateTab(&fMainTabA, fTabA, 1); AddValuator(tab[0], "mass Xi", 0, 5, 3, "MassXiRange()", 0); @@ -318,7 +318,7 @@ void CascadeListEditor::ResetCuts() { Float_t min,max; for (Int_t i=0; iGetLimitMin(); max = fRange[i]->GetLimitMax(); @@ -371,7 +371,7 @@ void CascadeListEditor::FillCanvas() { if (is2D) hist2D->Draw("colz"); else hist->Draw(); c1->Modified(); c1->Update(); - + c1b = fCanvasB[i]->GetCanvas(); c1b->cd(); if (is2D) hist2D->Draw("colz"); else hist->Draw(); @@ -389,7 +389,7 @@ void CascadeListEditor::UpdateSelectedTab() { gClient->GetColorByName("yellow", yellow); gClient->GetColorByName("grey", grey); - TGTabElement *tabElem; + TGTabElement *tabElem; for (i=0; iGetNumberOfTabs(); i++) { tabElem = fMainTabA->GetTabTab(i); diff --git a/EVE/Alieve/blacklisted-classes/AliEveCascadeEditors.h b/EVE/Alieve/blacklisted-classes/AliEveCascadeEditors.h index ebae1f0234d..0514c4189f3 100644 --- a/EVE/Alieve/blacklisted-classes/AliEveCascadeEditors.h +++ b/EVE/Alieve/blacklisted-classes/AliEveCascadeEditors.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ /*********************************************************************** This editor appears in the TEveUtil window when cascades are visualize. diff --git a/EVE/Alieve/blacklisted-classes/AliEveV0.cxx b/EVE/Alieve/blacklisted-classes/AliEveV0.cxx index 5a73419006a..303d4541b8c 100644 --- a/EVE/Alieve/blacklisted-classes/AliEveV0.cxx +++ b/EVE/Alieve/blacklisted-classes/AliEveV0.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ /************************************************************************** * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * @@ -157,49 +157,49 @@ void AliEveV0::MakeTrack(vpPathMark_t& pathMark, TEveVector& vtx, TEveVector& p TEveTrackPropagator& RS((fRnrStyle != 0) ? *fRnrStyle : TEveTrackPropagator::fgDefStyle); - Float_t px = p.x, py = p.y, pz = p.z; + Float_t px = p.x, py = p.y, pz = p.z; MCVertex mc_v0; mc_v0.x = vtx.x; - mc_v0.y = vtx.y; - mc_v0.z = vtx.z; + mc_v0.y = vtx.y; + mc_v0.z = vtx.z; mc_v0.t = 0; std::vector track_points; Bool_t decay = kFALSE; - if ((TMath::Abs(vtx.z) > RS.fMaxZ) || (vtx.x*vtx.x + vtx.y*vtx.y > RS.fMaxR*RS.fMaxR)) + if ((TMath::Abs(vtx.z) > RS.fMaxZ) || (vtx.x*vtx.x + vtx.y*vtx.y > RS.fMaxR*RS.fMaxR)) goto make_polyline; - + if (TMath::Abs(RS.fMagField) > 1e-5) { // Charged particle in magnetic field Float_t a = RS.fgkB2C * RS.fMagField * charge; - + MCHelix helix(fRnrStyle, &mc_v0, TMath::C()*beta, &track_points, a); //m->cm helix.Init(TMath::Sqrt(px*px+py*py), pz); - + if(!pathMark.empty()){ for(std::vector::iterator i=pathMark.begin(); i!=pathMark.end(); ++i) { TEvePathMark* pm = *i; - + if(RS.fFitDaughters && pm->type == TEvePathMark::Daughter){ - if(TMath::Abs(pm->V.z) > RS.fMaxZ + if(TMath::Abs(pm->V.z) > RS.fMaxZ || TMath::Sqrt(pm->V.x*pm->V.x + pm->V.y*pm->V.y) > RS.fMaxR ) goto helix_bounds; - //printf("%s fit daughter \n", fName.Data()); + //printf("%s fit daughter \n", fName.Data()); helix.LoopToVertex(p.x, p.y, p.z, pm->V.x, pm->V.y, pm->V.z); p.x -= pm->P.x; p.y -= pm->P.y; p.z -= pm->P.z; } if(RS.fFitDecay && pm->type == TEvePathMark::Decay){ - - if(TMath::Abs(pm->V.z) > RS.fMaxZ + + if(TMath::Abs(pm->V.z) > RS.fMaxZ || TMath::Sqrt(pm->V.x*pm->V.x + pm->V.y*pm->V.y) > RS.fMaxR ) goto helix_bounds; helix.LoopToVertex(p.x, p.y, p.z, pm->V.x, pm->V.y, pm->V.z); @@ -220,14 +220,14 @@ void AliEveV0::MakeTrack(vpPathMark_t& pathMark, TEveVector& vtx, TEveVector& p // Neutral particle or no field MCLine line(fRnrStyle, &mc_v0, TMath::C()*beta, &track_points); - + if(!pathMark.empty()) { for(std::vector::iterator i=pathMark.begin(); i!=pathMark.end(); ++i) { TEvePathMark* pm = *i; if(RS.fFitDaughters && pm->type == TEvePathMark::Daughter){ - if(TMath::Abs(pm->V.z) > RS.fMaxZ + if(TMath::Abs(pm->V.z) > RS.fMaxZ || TMath::Sqrt(pm->V.x*pm->V.x + pm->V.y*pm->V.y) > RS.fMaxR ) goto line_bounds; line.GotoVertex(pm->V.x, pm->V.y, pm->V.z); @@ -237,7 +237,7 @@ void AliEveV0::MakeTrack(vpPathMark_t& pathMark, TEveVector& vtx, TEveVector& p } if(RS.fFitDecay && pm->type == TEvePathMark::Decay){ - if(TMath::Abs(pm->V.z) > RS.fMaxZ + if(TMath::Abs(pm->V.z) > RS.fMaxZ || TMath::Sqrt(pm->V.x*pm->V.x + pm->V.y*pm->V.y) > RS.fMaxR ) goto line_bounds; line.GotoVertex(pm->V.x, pm->V.y, pm->V.z); @@ -264,11 +264,11 @@ make_polyline: //______________________________________________________________________ void AliEveV0::MakeV0path() { - + MCVertex mc_v0; mc_v0.x = fV_v0.x; - mc_v0.y = fV_v0.y; - mc_v0.z = fV_v0.z; + mc_v0.y = fV_v0.y; + mc_v0.z = fV_v0.z; mc_v0.t = 0; std::vector track_points; @@ -527,7 +527,7 @@ void V0List::AdjustHist(Int_t iHist) { if ((iHist<0)||(iHist>=fgkNcutVar)) return; if (! fHist[iHist]) return; - + TString name = fHist[iHist]->GetName(); Int_t nBin = fHist[iHist]->GetXaxis()->GetNbins(); delete fHist[iHist]; @@ -664,7 +664,7 @@ void V0List::FilterAll() { for (Int_t i=0; iReset(); - + AliEveV0* myV0; for(List_i i=fChildren.begin(); i!=fChildren.end(); ++i) { diff --git a/EVE/Alieve/blacklisted-classes/AliEveV0.h b/EVE/Alieve/blacklisted-classes/AliEveV0.h index 82a2d63d643..814a84a836e 100644 --- a/EVE/Alieve/blacklisted-classes/AliEveV0.h +++ b/EVE/Alieve/blacklisted-classes/AliEveV0.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef ALIEVE_V0_H #define ALIEVE_V0_H @@ -40,7 +40,7 @@ class AliEveV0 : public TEveElement, AliEveV0(const AliEveV0&); // Not implemented AliEveV0& operator=(const AliEveV0&); // Not implemented -public: +public: AliEveV0(); AliEveV0(TEveRecTrack* tNeg, TEveRecTrack* tPos, TEveRecV0* v0, TEveTrackPropagator* rs); @@ -165,12 +165,12 @@ protected: //______________________________________________________________________ -inline void AliEveV0::SetDaughterDCA(Float_t dca) { - fDaughterDCA = dca; +inline void AliEveV0::SetDaughterDCA(Float_t dca) { + fDaughterDCA = dca; } -inline void AliEveV0::SetCosPointingAngle(Float_t cos) { - fCosPointingAngle = cos; +inline void AliEveV0::SetCosPointingAngle(Float_t cos) { + fCosPointingAngle = cos; } inline void AliEveV0::SetDecayLength(Float_t len) { @@ -339,7 +339,7 @@ public: virtual void Paint(Option_t* option=""); void SetRnrStyle(TEveTrackPropagator* rst) { fRnrStyle= rst; } - TEveTrackPropagator* GetPropagator() { return fRnrStyle; } + TEveTrackPropagator* GetPropagator() { return fRnrStyle; } Bool_t GetRnrV0vtx() const { return fRnrV0vtx; } Bool_t GetRnrV0path() const { return fRnrV0path; } diff --git a/EVE/Alieve/blacklisted-classes/AliEveV0Editors.cxx b/EVE/Alieve/blacklisted-classes/AliEveV0Editors.cxx index ba3d0c6b435..14a3582961b 100644 --- a/EVE/Alieve/blacklisted-classes/AliEveV0Editors.cxx +++ b/EVE/Alieve/blacklisted-classes/AliEveV0Editors.cxx @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ /************************************************************************** * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * @@ -70,15 +70,15 @@ V0ListEditor::V0ListEditor(const TGWindow *p, fMainTabB(0) { MakeTitle("V0List"); - + //TGHorizontalFrame* frame = new TGHorizontalFrame(this); - + // --- Rendering control fRnrV0path = new TGCheckButton(this, "Render v0 path"); AddFrame(fRnrV0path, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); fRnrV0path->Connect("Toggled(Bool_t)", - "V0ListEditor", this, "DoRnrV0path()"); + "V0ListEditor", this, "DoRnrV0path()"); fRnrV0vtx = new TGCheckButton(this, "Render v0 vertices"); AddFrame(fRnrV0vtx, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); @@ -89,7 +89,7 @@ V0ListEditor::V0ListEditor(const TGWindow *p, AddFrame(fRnrV0sDaugh, new TGLayoutHints(kLHintsTop, 3, 1, 1, 0)); fRnrV0sDaugh->Connect("Toggled(Bool_t)", "V0ListEditor", this, "DoRnrDaughters()"); - + for (Int_t i=0; iSetTicks(1,0); c1->SetGrid(); c1->SetBorderMode(0); - + frameTab->AddFrame(*embeddedCanvas, new TGLayoutHints(kLHintsTop|kLHintsExpandX, 0, 0, 0, 0)); return frameTab; @@ -155,12 +155,12 @@ TGCompositeFrame** V0ListEditor::CreateTab(TGTab **pMainTab, TGTab **ptab, Int_t pMainTab[0]->Connect("Selected(Int_t)", "V0ListEditor", this, "UpdateSelectedTab()"); this->AddFrame(pMainTab[0], new TGLayoutHints( kLHintsTop | kLHintsExpandX,2,2,2,2)); - + //------ // container of "Tab1" TGCompositeFrame *frameTab1 = pMainTab[0]->AddTab("ident."); frameTab1->SetLayoutManager(new TGVerticalLayout(frameTab1)); - + // tab widget ptab[0] = new TGTab(frameTab1,2,2); @@ -169,23 +169,23 @@ TGCompositeFrame** V0ListEditor::CreateTab(TGTab **pMainTab, TGTab **ptab, Int_t // (it updates every canvas) ptab[0]->Connect("Selected(Int_t)", "V0ListEditor", this, "UpdateSelectedTab()"); frameTab1->AddFrame(ptab[0], new TGLayoutHints(kLHintsLeft| kLHintsExpandX,0,0,0,0)); - + //------ // container of "Tab2" TGCompositeFrame *frameTab2 = pMainTab[0]->AddTab("v0"); frameTab2->SetLayoutManager(new TGVerticalLayout(frameTab2)); - + // tab widget ptab[1] = new TGTab(frameTab2,440,299); ptab[1]->Resize(ptab[1]->GetDefaultSize()); ptab[1]->Connect("Selected(Int_t)", "V0ListEditor", this, "UpdateSelectedTab()"); frameTab2->AddFrame(ptab[1], new TGLayoutHints(kLHintsLeft| kLHintsExpandX ,0,0,0,0)); - + //------ // container of "Tab3" TGCompositeFrame *frameTab3 = pMainTab[0]->AddTab("daughters"); frameTab3->SetLayoutManager(new TGVerticalLayout(frameTab3)); - + // tab widget ptab[2] = new TGTab(frameTab3,440,299); ptab[2]->Resize(ptab[2]->GetDefaultSize()); @@ -194,7 +194,7 @@ TGCompositeFrame** V0ListEditor::CreateTab(TGTab **pMainTab, TGTab **ptab, Int_t //------ TGCompositeFrame **frameTab = new TGCompositeFrame*[fgkNCanvas]; - + frameTab[0] = AddTab(ptab[0], 0, can, "K0s"); frameTab[1] = AddTab(ptab[0], 1, can, "Lambda"); frameTab[2] = AddTab(ptab[0], 2, can, "Anti-Lambda"); @@ -268,7 +268,7 @@ void V0ListEditor::AddValuator(TGCompositeFrame* frame, char *name, //_________________________________________________________________________ void V0ListEditor::AddSelectTab() { - + TGCompositeFrame** tab = CreateTab(&fMainTabA, fTabA, 1); AddValuator(tab[0], "mass K0s", 0, 5, 3, "MassK0sRange()", 1); @@ -314,7 +314,7 @@ void V0ListEditor::ResetCuts() { Float_t min,max; for (Int_t i=0; iGetLimitMin(); max = fRange[i]->GetLimitMax(); @@ -368,7 +368,7 @@ void V0ListEditor::FillCanvas() { if (is2D) hist2D->Draw("colz"); else hist->Draw(); c1->Modified(); c1->Update(); - + c1b = fCanvasB[i]->GetCanvas(); c1b->cd(); if (is2D) hist2D->Draw("colz"); else hist->Draw(); @@ -388,7 +388,7 @@ void V0ListEditor::UpdateSelectedTab() { gClient->GetColorByName("yellow", yellow); gClient->GetColorByName("grey", grey); - TGTabElement *tabElem; + TGTabElement *tabElem; for (i=0; iGetNumberOfTabs(); i++) { tabElem = fMainTabA->GetTabTab(i); diff --git a/EVE/Alieve/blacklisted-classes/AliEveV0Editors.h b/EVE/Alieve/blacklisted-classes/AliEveV0Editors.h index 25271e16029..215b44e6d8c 100644 --- a/EVE/Alieve/blacklisted-classes/AliEveV0Editors.h +++ b/EVE/Alieve/blacklisted-classes/AliEveV0Editors.h @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * diff --git a/EVE/alice-macros/MUON_display.C b/EVE/alice-macros/MUON_display.C index b83390928db..3350cc6f557 100644 --- a/EVE/alice-macros/MUON_display.C +++ b/EVE/alice-macros/MUON_display.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "TGLViewer.h" @@ -21,8 +21,8 @@ Bool_t g_fromRaw = kFALSE; void MUON_display(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE) { - - if (!AliMpSegmentation::Instance()) AliMpCDB::LoadMpSegmentation(); + + if (!AliMpSegmentation::Instance()) AliMpCDB::LoadMpSegmentation(); if (!AliMpDDLStore::Instance()) AliMpCDB::LoadDDLStore(); TTree* dt = 0; @@ -56,7 +56,7 @@ void MUON_display(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE) AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); g_muon_data = new AliEveMUONData; - + if (!fromRaw) { rl->LoadDigits("MUON"); dt = rl->GetTreeD("MUON", false); @@ -74,35 +74,35 @@ void MUON_display(Bool_t fromRaw = kFALSE, Bool_t showTracks = kTRUE) g_muon_data->LoadRaw(dataPath.Data()); } } - + rl->LoadRecPoints("MUON"); ct = rl->GetTreeR("MUON", false); g_muon_data->LoadRecPoints(ct); - + rl->LoadHits("MUON"); ht = rl->GetTreeH("MUON", false); g_muon_data->LoadHits(ht); - + g_muon_last_event = gEvent; - + g_currentEvent = g_muon_last_event->GetEventId(); - + gStyle->SetPalette(1, 0); gEve->DisableRedraw(); - + TEveElementList* l = new TEveElementList("MUONChambers"); l->SetTitle("MUON chambers"); l->SetMainColor(Color_t(2)); gEve->AddElement(l); - + for (Int_t ic = 0; ic < 14; ic++) { AliEveMUONChamber* mucha = new AliEveMUONChamber(ic); - + mucha->SetFrameColor(2); mucha->SetChamberID(ic); - + mucha->SetDataSource(g_muon_data); gEve->AddElement(mucha, l); @@ -142,9 +142,9 @@ void MUON_tracks() { Int_t ntracks = tracks->GetEntriesFast(); //printf("Found %d tracks. \n",ntracks); - TEveTrackList* lt = new TEveTrackList("M-Tracks"); + TEveTrackList* lt = new TEveTrackList("M-Tracks"); lt->SetMainColor(Color_t(6)); - //lt->SetMUON(); + //lt->SetMUON(); gEve->AddElement(lt); @@ -155,14 +155,14 @@ void MUON_tracks() { Float_t xRec, xRec0; Float_t yRec, yRec0; Float_t zRec, zRec0; - + Float_t zg[4] = { -1603.5, -1620.5, -1703.5, -1720.5 }; - AliMUONTrack *mt; + AliMUONTrack *mt; TEveRecTrack rt; Int_t count; for (Int_t n = 0; n < ntracks; n++) { - + count = 0; mt = (AliMUONTrack*) tracks->At(n); @@ -195,9 +195,9 @@ void MUON_trigger_tracks() { Int_t ntracks = tracks->GetEntriesFast(); //printf("Found %d tracks. \n",ntracks); - TEveTrackList* lt = new TEveTrackList("MT-Tracks"); + TEveTrackList* lt = new TEveTrackList("MT-Tracks"); lt->SetMainColor(Color_t(4)); - //lt->SetMUON(); + //lt->SetMUON(); gEve->AddElement(lt); @@ -208,14 +208,14 @@ void MUON_trigger_tracks() { Float_t xRec, xRec0; Float_t yRec, yRec0; Float_t zRec, zRec0; - + Float_t zg[4] = { -1603.5, -1620.5, -1703.5, -1720.5 }; - AliMUONTriggerTrack *mt; + AliMUONTriggerTrack *mt; TEveRecTrack rt; Int_t count; for (Int_t n = 0; n < ntracks; n++) { - + count = 0; mt = (AliMUONTriggerTrack*) tracks->At(n); @@ -239,7 +239,7 @@ void MUON_ESD_tracks() { AliESDEvent* esd = AliEveEventManager::AssertESD(); - TEveTrackList* lt = new TEveTrackList("ESD-Tracks"); + TEveTrackList* lt = new TEveTrackList("ESD-Tracks"); lt->SetMainColor(Color_t(6)); //lt->SetMUON(); @@ -274,14 +274,14 @@ void MUON_Ref_tracks() { AliMUONVTrackStore* trackRefStore = recoCheck.ReconstructibleTracks(gEvent->GetEventId()); TIter next(trackRefStore->CreateIterator()); AliMUONTrack* trackRef; - - TEveTrackList* lt = new TEveTrackList("Ref-Tracks"); + + TEveTrackList* lt = new TEveTrackList("Ref-Tracks"); lt->SetMainColor(Color_t(6)); gEve->AddElement(lt); TEveRecTrack rt; - Int_t i = 0; + Int_t i = 0; while ( ( trackRef = static_cast(next()) ) ) { rt.label = i++; @@ -308,7 +308,7 @@ void MUON_MC_tracks() { Int_t nPrimary = stack->GetNprimary(); Int_t nTracks = stack->GetNtrack(); - TEveTrackList* lt = new TEveTrackList("MC-Tracks"); + TEveTrackList* lt = new TEveTrackList("MC-Tracks"); lt->SetMainColor(Color_t(6)); //lt->SetMUON(); diff --git a/EVE/alice-macros/MUON_geom.C b/EVE/alice-macros/MUON_geom.C index a8d28205bf8..b354e4b5e8c 100644 --- a/EVE/alice-macros/MUON_geom.C +++ b/EVE/alice-macros/MUON_geom.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void MUON_geom() diff --git a/EVE/alice-macros/MUON_geomAll.C b/EVE/alice-macros/MUON_geomAll.C index 88a730daf35..f0fa7c73f34 100644 --- a/EVE/alice-macros/MUON_geomAll.C +++ b/EVE/alice-macros/MUON_geomAll.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void MUON_geomAll() @@ -18,9 +18,9 @@ void MUON_geomAll() TEveGeoTopNode* topn_re = new TEveGeoTopNode (gGeoManager, gGeoManager->GetTopNode()); - + gEve->AddGlobalElement(topn_re); gEve->Redraw3D(kTRUE); - + } diff --git a/EVE/alice-macros/MUON_trigger_info.C b/EVE/alice-macros/MUON_trigger_info.C index 8616c966b7b..5a5ce307aea 100644 --- a/EVE/alice-macros/MUON_trigger_info.C +++ b/EVE/alice-macros/MUON_trigger_info.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include @@ -13,19 +13,19 @@ void MUON_trigger_info(Int_t label) { AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); TTree* tt = rl->GetTreeT("MUON", false); - + TClonesArray *tracks = 0; tt->SetBranchAddress("AliEveMUONTrack",&tracks); tt->GetEntry(0); Int_t ntracks = tracks->GetEntriesFast(); - + if (ntracks <= label) return; - AliMUONTrack *mt = tracks->At(label); + AliMUONTrack *mt = tracks->At(label); TTree* tr = rl->GetTreeR("MUON", false); - + TClonesArray *lotrig = 0; tr->SetBranchAddress("MUONLocalTrigger",&lotrig); tr->GetEntry(0); @@ -40,10 +40,10 @@ void MUON_trigger_info(Int_t label) { AliMUONTrackParam *mtp = (AliMUONTrackParam*)mt->GetTrackParamAtVertex(); Float_t pt = TMath::Sqrt(mtp->Px()*mtp->Px()+mtp->Py()*mtp->Py()); - cout << " Pt = " << + cout << " Pt = " << setw(8) << setprecision(3) << pt << " GeV/c" << endl; - + cout << endl; if (mt->GetLoTrgNum() >= 0) { @@ -73,6 +73,6 @@ void MUON_trigger_info(Int_t label) { } cout << endl; cout << "#########################################################################################################################<<<<<" << endl; - + } diff --git a/EVE/alice-macros/NLT_test.C b/EVE/alice-macros/NLT_test.C index 29f40d6dc98..dae8f9fe168 100644 --- a/EVE/alice-macros/NLT_test.C +++ b/EVE/alice-macros/NLT_test.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEveProjectionManager* NLT_test(TEveElement* top=0) diff --git a/EVE/alice-macros/NLT_trackcount_init.C b/EVE/alice-macros/NLT_trackcount_init.C index cf7de35273e..688915cab4c 100644 --- a/EVE/alice-macros/NLT_trackcount_init.C +++ b/EVE/alice-macros/NLT_trackcount_init.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ class TEveProjectionManager; @@ -27,7 +27,7 @@ void NLT_trackcount_init() TEveUtil::LoadMacro("tpc_clusters.C+"); TEveViewer* nv = gEve->SpawnNewViewer("NLT Projected"); - TEveScene* ns = gEve->SpawnNewScene("NLT"); + TEveScene* ns = gEve->SpawnNewScene("NLT"); nv->AddScene(ns); TGLViewer* v = nv->GetGLViewer(); v->SetCurrentCamera(TGLViewer::kCameraOrthoXOY); diff --git a/EVE/alice-macros/acorde_hits.C b/EVE/alice-macros/acorde_hits.C index 96ca3eb1837..5c32f86baa6 100644 --- a/EVE/alice-macros/acorde_hits.C +++ b/EVE/alice-macros/acorde_hits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* @@ -16,7 +16,7 @@ acorde_hits(const char *varexp = "ACORDE.fX:ACORDE.fY:ACORDE.fZ", rl->LoadHits("ACORDE"); TTree* ht = rl->GetTreeH("ACORDE", false); - + //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT //PH on some platforms (alphalinuxgcc, solariscc5, etc.) diff --git a/EVE/alice-macros/clusters_from_index.C b/EVE/alice-macros/clusters_from_index.C index 0daa87a31ed..cdd4ab6a8d9 100644 --- a/EVE/alice-macros/clusters_from_index.C +++ b/EVE/alice-macros/clusters_from_index.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* clusters_from_index(Int_t index=0, TEveElement* cont=0) @@ -40,7 +40,7 @@ TEvePointSet* clusters_from_index(Int_t index=0, TEveElement* cont=0) pArr->GetPoint(*atp, i); clusters->SetPointId(atp); } - + if(clusters->Size() == 0 && gEve->GetKeepEmptyCont() == kFALSE) { Warning("clusters_from_index", Form("No clusters for index '%d'", index)); delete clusters; diff --git a/EVE/alice-macros/clusters_from_label.C b/EVE/alice-macros/clusters_from_label.C index 8547b263850..830fadabc44 100644 --- a/EVE/alice-macros/clusters_from_label.C +++ b/EVE/alice-macros/clusters_from_label.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* clusters_from_label(Int_t label=0, TEveElement* cont=0) diff --git a/EVE/alice-macros/emcal_digits.C b/EVE/alice-macros/emcal_digits.C index 1290c7c59c5..5cdc83c5955 100644 --- a/EVE/alice-macros/emcal_digits.C +++ b/EVE/alice-macros/emcal_digits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void emcal_digits() { @@ -87,8 +87,8 @@ void emcal_digits() cout<<"Cell ID "<GetCellIndex(id,iSupMod,iTower,iIphi,iIeta); + //Geometry methods + geom->GetCellIndex(id,iSupMod,iTower,iIphi,iIeta); //Gives SuperModule and Tower numbers geom->GetCellPhiEtaIndexInSModule(iSupMod,iTower, iIphi, iIeta,iphi,ieta); diff --git a/EVE/alice-macros/emcal_hits.C b/EVE/alice-macros/emcal_hits.C index 56518af5144..4bea8f4cc7f 100644 --- a/EVE/alice-macros/emcal_hits.C +++ b/EVE/alice-macros/emcal_hits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* @@ -16,7 +16,7 @@ emcal_hits(const char *varexp = "fX:fY:fZ", rl->LoadHits("EMCAL"); TTree* ht = rl->GetTreeH("EMCAL", false); - + //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT //PH on some platforms (alphalinuxgcc, solariscc5, etc.) diff --git a/EVE/alice-macros/esd_Cascade.C b/EVE/alice-macros/esd_Cascade.C index 1a0b8c7360f..5a2e449c8ed 100644 --- a/EVE/alice-macros/esd_Cascade.C +++ b/EVE/alice-macros/esd_Cascade.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // #include "EVE/Alieve/EventAlieve.h" // #include "TEveManager.h" @@ -20,7 +20,7 @@ -AliEveCascade* esd_make_cas(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx, +AliEveCascade* esd_make_cas(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx, AliESDcascade* cas, AliESDtrack* neg, AliESDtrack* pos, AliESDtrack* bach,Int_t i) { @@ -74,7 +74,7 @@ CascadeList* esd_AliEveCascade(Double_t min_pt=0.1, Double_t max_pt=100) AliESDEvent* esd = AliEveEventManager::AssertESD(); AliESDVertex* primVertex =(AliESDVertex*) esd->GetVertex(); - CascadeList* cont = new CascadeList("ESD cascade"); + CascadeList* cont = new CascadeList("ESD cascade"); cont->SetMainColor(Color_t(3)); // green TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( esd->GetMagneticField() ); diff --git a/EVE/alice-macros/esd_V0.C b/EVE/alice-macros/esd_V0.C index 6e67247439b..d7f920da926 100644 --- a/EVE/alice-macros/esd_V0.C +++ b/EVE/alice-macros/esd_V0.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ @@ -44,7 +44,7 @@ AliEveV0* esd_make_v0(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx, // printf(" %f %f %f / %f %f %f %i\n",p[0], p[1], p[2], // v[0], v[1], v[2], v0->GetOnFlyStatus()); - rcV0.V_neg.Set(v); //original track vertices at dca not stored + rcV0.V_neg.Set(v); //original track vertices at dca not stored rcV0.V_pos.Set(v); rcV0.V_ca.Set(v); @@ -59,7 +59,7 @@ AliEveV0* esd_make_v0(TEveTrackPropagator* rnrStyle, AliESDVertex* primVtx, AliEveV0* myV0 = new AliEveV0(&rcNeg, &rcPos, &rcV0, rnrStyle); char ch[50]; - // sprintf(ch,"ESDv0%i",i); + // sprintf(ch,"ESDv0%i",i); // myV0->SetName(ch); // myV0->SetTitle(ch); myV0->SetESDIndex(i); @@ -90,7 +90,7 @@ V0List* esd_AliEveV0(Double_t min_pt=0.1, Double_t max_pt=100) AliESDEvent* esd = AliEveEventManager::AssertESD(); AliESDVertex* primVertex =(AliESDVertex*) esd->GetVertex(); - V0List* cont = new V0List("ESD v0"); + V0List* cont = new V0List("ESD v0"); cont->SetMainColor(Color_t(3)); // green TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( esd->GetMagneticField() ); @@ -108,7 +108,7 @@ V0List* esd_AliEveV0(Double_t min_pt=0.1, Double_t max_pt=100) Int_t posInd = v0->GetPindex(); AliESDtrack* negTr = esd->GetTrack(negInd); AliESDtrack* posTr = esd->GetTrack(posInd); - + AliEveV0* myV0 = esd_make_v0(rnrStyle, primVertex, negTr,posTr, v0, n); if (myV0) { gEve->AddElement(myV0, cont); diff --git a/EVE/alice-macros/esd_V0_points.C b/EVE/alice-macros/esd_V0_points.C index ac88fce2369..e1622e4c9f7 100644 --- a/EVE/alice-macros/esd_V0_points.C +++ b/EVE/alice-macros/esd_V0_points.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* diff --git a/EVE/alice-macros/esd_spd_tracklets.C b/EVE/alice-macros/esd_spd_tracklets.C index 0f1deddeacb..c2f971eb8ce 100644 --- a/EVE/alice-macros/esd_spd_tracklets.C +++ b/EVE/alice-macros/esd_spd_tracklets.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // To use when per-line id is supported class TrackletId : public TObject diff --git a/EVE/alice-macros/esd_tracks.C b/EVE/alice-macros/esd_tracks.C index 1dc284a7f0f..e7ac628ce53 100644 --- a/EVE/alice-macros/esd_tracks.C +++ b/EVE/alice-macros/esd_tracks.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEveTrack* esd_make_track(TEveTrackPropagator* rnrStyle, @@ -28,7 +28,7 @@ TEveTrack* esd_make_track(TEveTrackPropagator* rnrStyle, rt.fP.Set(pbuf); Double_t ep = at->GetP(), mc = at->GetMass(); rt.fBeta = ep/TMath::Sqrt(ep*ep + mc*mc); - + TEveTrack* track = new TEveTrack(&rt, rnrStyle); //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT @@ -54,7 +54,7 @@ TEveTrackList* esd_tracks(Double_t min_pt=0.1, Double_t max_pt=100) Double_t maxptsq = max_pt*max_pt; Double_t ptsq; - TEveTrackList* cont = new TEveTrackList("ESD Tracks"); + TEveTrackList* cont = new TEveTrackList("ESD Tracks"); cont->SetMainColor(Color_t(6)); TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( esd->GetMagneticField() ); @@ -114,7 +114,7 @@ TEveTrackList* esd_tracks_from_array(TCollection* col, AliESDEvent* esd=0) if (esd == 0) esd = AliEveEventManager::AssertESD(); - TEveTrackList* cont = new TEveTrackList("ESD Tracks"); + TEveTrackList* cont = new TEveTrackList("ESD Tracks"); cont->SetMainColor(Color_t(6)); TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( esd->GetMagneticField() ); @@ -281,7 +281,7 @@ TEveElementList* esd_tracks_vertex_cut() ++count; TEveTrack* track = esd_make_track(tlist->GetPropagator(), n, at, tp); - track->SetAttLineAttMarker(tlist); + track->SetAttLineAttMarker(tlist); //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT diff --git a/EVE/alice-macros/event_goto.C b/EVE/alice-macros/event_goto.C index fa522e95bad..98ba53b8746 100644 --- a/EVE/alice-macros/event_goto.C +++ b/EVE/alice-macros/event_goto.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void event_goto(Int_t event=0) { diff --git a/EVE/alice-macros/event_next.C b/EVE/alice-macros/event_next.C index b6ea804426c..fa02e49148e 100644 --- a/EVE/alice-macros/event_next.C +++ b/EVE/alice-macros/event_next.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void event_next() { diff --git a/EVE/alice-macros/event_prev.C b/EVE/alice-macros/event_prev.C index fcf8c626da1..b53d5583c25 100644 --- a/EVE/alice-macros/event_prev.C +++ b/EVE/alice-macros/event_prev.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void event_prev() { diff --git a/EVE/alice-macros/fmd_hits.C b/EVE/alice-macros/fmd_hits.C index fe9b0594aa4..125b866d2c3 100644 --- a/EVE/alice-macros/fmd_hits.C +++ b/EVE/alice-macros/fmd_hits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* @@ -15,7 +15,7 @@ fmd_hits(const char *varexp = "fX:fY:fZ", rl->LoadHits("FMD"); TTree* ht = rl->GetTreeH("FMD", false); - + //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT //PH on some platforms (alphalinuxgcc, solariscc5, etc.) diff --git a/EVE/alice-macros/geom_acorde.C b/EVE/alice-macros/geom_acorde.C index b134f00500a..8ef29779942 100644 --- a/EVE/alice-macros/geom_acorde.C +++ b/EVE/alice-macros/geom_acorde.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_acorde() diff --git a/EVE/alice-macros/geom_all.C b/EVE/alice-macros/geom_all.C index 91be4416dc2..ffed6dd04e1 100644 --- a/EVE/alice-macros/geom_all.C +++ b/EVE/alice-macros/geom_all.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_all() diff --git a/EVE/alice-macros/geom_ddip.C b/EVE/alice-macros/geom_ddip.C index 3d23e985fc4..588bbe39c12 100644 --- a/EVE/alice-macros/geom_ddip.C +++ b/EVE/alice-macros/geom_ddip.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_ddip() diff --git a/EVE/alice-macros/geom_emcal.C b/EVE/alice-macros/geom_emcal.C index f14e91c0d53..95ccebda182 100644 --- a/EVE/alice-macros/geom_emcal.C +++ b/EVE/alice-macros/geom_emcal.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_emcal() diff --git a/EVE/alice-macros/geom_fmd.C b/EVE/alice-macros/geom_fmd.C index c9f9d8f5ec5..190ff1b7b98 100644 --- a/EVE/alice-macros/geom_fmd.C +++ b/EVE/alice-macros/geom_fmd.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_fmd() diff --git a/EVE/alice-macros/geom_gentle.C b/EVE/alice-macros/geom_gentle.C index b19fad0d93d..9203a5e0738 100644 --- a/EVE/alice-macros/geom_gentle.C +++ b/EVE/alice-macros/geom_gentle.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEveGeoShape* geom_gentle() diff --git a/EVE/alice-macros/geom_hmpid.C b/EVE/alice-macros/geom_hmpid.C index 25b73a93f1e..7c980e69413 100644 --- a/EVE/alice-macros/geom_hmpid.C +++ b/EVE/alice-macros/geom_hmpid.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_hmpid() diff --git a/EVE/alice-macros/geom_its.C b/EVE/alice-macros/geom_its.C index 9d7c4b45576..3e64e41922a 100644 --- a/EVE/alice-macros/geom_its.C +++ b/EVE/alice-macros/geom_its.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_its() diff --git a/EVE/alice-macros/geom_phos.C b/EVE/alice-macros/geom_phos.C index a682b333d5a..93ce62c1011 100644 --- a/EVE/alice-macros/geom_phos.C +++ b/EVE/alice-macros/geom_phos.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_phos() diff --git a/EVE/alice-macros/geom_pmd.C b/EVE/alice-macros/geom_pmd.C index 876f63f9c59..c6e9839e9dc 100644 --- a/EVE/alice-macros/geom_pmd.C +++ b/EVE/alice-macros/geom_pmd.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_pmd() diff --git a/EVE/alice-macros/geom_simple.C b/EVE/alice-macros/geom_simple.C index 3411f294589..1b6c0ae0688 100644 --- a/EVE/alice-macros/geom_simple.C +++ b/EVE/alice-macros/geom_simple.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_simple() diff --git a/EVE/alice-macros/geom_t0.C b/EVE/alice-macros/geom_t0.C index 0e20de6ee68..d2fe16c80a1 100644 --- a/EVE/alice-macros/geom_t0.C +++ b/EVE/alice-macros/geom_t0.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_t0() diff --git a/EVE/alice-macros/geom_tpc.C b/EVE/alice-macros/geom_tpc.C index 0f2737187b8..7bdb14aec96 100644 --- a/EVE/alice-macros/geom_tpc.C +++ b/EVE/alice-macros/geom_tpc.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_tpc() diff --git a/EVE/alice-macros/geom_trd_tof.C b/EVE/alice-macros/geom_trd_tof.C index d45ab61f530..6d89c8f3b52 100644 --- a/EVE/alice-macros/geom_trd_tof.C +++ b/EVE/alice-macros/geom_trd_tof.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_trd_tof() diff --git a/EVE/alice-macros/geom_vzero.C b/EVE/alice-macros/geom_vzero.C index eceacd61012..37e07f44465 100644 --- a/EVE/alice-macros/geom_vzero.C +++ b/EVE/alice-macros/geom_vzero.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void geom_vzero() diff --git a/EVE/alice-macros/hits_from_label.C b/EVE/alice-macros/hits_from_label.C index 6eb77a321ad..c0bfe310b99 100644 --- a/EVE/alice-macros/hits_from_label.C +++ b/EVE/alice-macros/hits_from_label.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void hits_from_label(Int_t label=0, TEveElement* cont) diff --git a/EVE/alice-macros/hmpid_clusters.C b/EVE/alice-macros/hmpid_clusters.C index 6248ddbf72f..beb0b0f0727 100644 --- a/EVE/alice-macros/hmpid_clusters.C +++ b/EVE/alice-macros/hmpid_clusters.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifdef __CINT__ @@ -47,7 +47,7 @@ TEvePointSet* hmpid_clusters(TEveElement* cont=0, Float_t maxR=1000) clusters->SetOwnIds(kTRUE); AliEveEventManager::AssertGeometry(); - + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadRecPoints("HMPID"); @@ -58,7 +58,7 @@ TEvePointSet* hmpid_clusters(TEveElement* cont=0, Float_t maxR=1000) TBranch *br=cTree->GetBranch(name[k]); if (!br) return 0; br->SetAddress(&(cl[k])); - } + } if (!cTree->GetEvent(0)) return 0; diff --git a/EVE/alice-macros/init_trd.C b/EVE/alice-macros/init_trd.C index 211cd9968eb..f48efcc3305 100644 --- a/EVE/alice-macros/init_trd.C +++ b/EVE/alice-macros/init_trd.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void init_trd() { diff --git a/EVE/alice-macros/its_clusters.C b/EVE/alice-macros/its_clusters.C index 14921d45061..e08118c407f 100644 --- a/EVE/alice-macros/its_clusters.C +++ b/EVE/alice-macros/its_clusters.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifdef __CINT__ diff --git a/EVE/alice-macros/its_digits.C b/EVE/alice-macros/its_digits.C index 6d758448066..d42203e5b20 100644 --- a/EVE/alice-macros/its_digits.C +++ b/EVE/alice-macros/its_digits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // Load ITS digits. diff --git a/EVE/alice-macros/its_hits.C b/EVE/alice-macros/its_hits.C index c6c74ebb838..321a5c89b00 100644 --- a/EVE/alice-macros/its_hits.C +++ b/EVE/alice-macros/its_hits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* @@ -16,7 +16,7 @@ its_hits(const char *varexp = "fX:fY:fZ", rl->LoadHits("ITS"); TTree* ht = rl->GetTreeH("ITS", false); - + //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT //PH on some platforms (alphalinuxgcc, solariscc5, etc.) diff --git a/EVE/alice-macros/its_hits_layer_split.C b/EVE/alice-macros/its_hits_layer_split.C index 26cdbd0af26..3093080d57f 100644 --- a/EVE/alice-macros/its_hits_layer_split.C +++ b/EVE/alice-macros/its_hits_layer_split.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void its_hits_layer_split(const char *varexp = "fX:fY:fZ:GetLayer()", diff --git a/EVE/alice-macros/its_module_stepper.C b/EVE/alice-macros/its_module_stepper.C index 79ffd9e7ba0..28ca28db630 100644 --- a/EVE/alice-macros/its_module_stepper.C +++ b/EVE/alice-macros/its_module_stepper.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "TGLViewer.h" namespace Alieve diff --git a/EVE/alice-macros/its_raw.C b/EVE/alice-macros/its_raw.C index 4021e13e8ee..65786e3039e 100644 --- a/EVE/alice-macros/its_raw.C +++ b/EVE/alice-macros/its_raw.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void its_raw(const char *input = "rawdata.root", Int_t mode = 63, diff --git a/EVE/alice-macros/jetplane.C b/EVE/alice-macros/jetplane.C index 4059191367b..e24e34527e5 100644 --- a/EVE/alice-macros/jetplane.C +++ b/EVE/alice-macros/jetplane.C @@ -4,10 +4,10 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ AliEveJetPlane* jetplane(Int_t iev) -{ +{ TFile* f = new TFile("aod.root"); TTree* treeAOD = (TTree*) f->Get("AOD"); AliAODEvent* aod = new AliAODEvent(); diff --git a/EVE/alice-macros/kine_tracks.C b/EVE/alice-macros/kine_tracks.C index 5a2613ef3de..190f8ddf4c5 100644 --- a/EVE/alice-macros/kine_tracks.C +++ b/EVE/alice-macros/kine_tracks.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // Import tracks from kinematics-tree / particle-stack. // Preliminary/minimal solution. @@ -25,8 +25,8 @@ kine_tracks(Double_t min_pt = 0.1, Double_t min_p = 0.2, } gEve->DisableRedraw(); - - TEveTrackList* cont = new TEveTrackList("Kine Tracks"); + + TEveTrackList* cont = new TEveTrackList("Kine Tracks"); cont->SetMainColor(Color_t(3)); TEveTrackPropagator* rnrStyle = cont->GetPropagator(); // !!! Watch the '-', apparently different sign convention then for ESD. @@ -35,16 +35,16 @@ kine_tracks(Double_t min_pt = 0.1, Double_t min_p = 0.2, gEve->AddElement(cont); Int_t count = 0; Int_t N = stack->GetNtrack(); - for (Int_t i=0; iIsPhysicalPrimary(i)) + if(stack->IsPhysicalPrimary(i)) { TParticle* p = stack->Particle(i); if (p->Pt() < min_pt && p->P() < min_p) continue; ++count; TEveTrack* track = new TEveTrack(p, i, rnrStyle); - + //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT //PH on some platforms (alphalinuxgcc, solariscc5, etc.) @@ -63,7 +63,7 @@ kine_tracks(Double_t min_pt = 0.1, Double_t min_p = 0.2, } // set path marks - AliEveKineTools kt; + AliEveKineTools kt; kt.SetDaughterPathMarks(cont, stack, recurse); if (use_track_refs && rl->LoadTrackRefs() == 0) { @@ -90,15 +90,15 @@ void kine_daughters(TEveTrack* parent, AliStack* stack, Bool_t pdg_col, Bool_t recurse) { TParticle *p = stack->Particle(parent->GetLabel()); - if (p->GetNDaughters() > 0) + if (p->GetNDaughters() > 0) { TEveTrackPropagator* rs = parent->GetPropagator(); - for (int d=p->GetFirstDaughter(); d>0 && d<=p->GetLastDaughter(); ++d) - { + for (int d=p->GetFirstDaughter(); d>0 && d<=p->GetLastDaughter(); ++d) + { TParticle* dp = stack->Particle(d); if (dp->Pt() < min_pt && dp->P() < min_p) continue; - TEveTrack* dtrack = new TEveTrack(dp, d, rs); + TEveTrack* dtrack = new TEveTrack(dp, d, rs); char form[1000]; sprintf(form,"%s [%d]", dp->GetName(), d); dtrack->SetName(form); @@ -127,7 +127,7 @@ Color_t get_pdg_color(Int_t pdg) static const Color_t DefCol = 30; static const Color_t ECol = 5; static const Color_t MuCol = 6; - static const Color_t GammaCol = 7; + static const Color_t GammaCol = 7; static const Color_t MesCol1 = 3; static const Color_t MesCol2 = 38; static const Color_t BarCol = 10; @@ -138,8 +138,8 @@ Color_t get_pdg_color(Int_t pdg) // elementary particles if (pdga < 100) { switch (pdga) { - case 11: - col = ECol; break; + case 11: + col = ECol; break; case 12: col = MuCol; break; case 22: @@ -150,9 +150,9 @@ Color_t get_pdg_color(Int_t pdg) else if (pdga < 100000) { Int_t i = pdga; Int_t i0 = i%10; i /= 10; - Int_t i1 = i%10; i /= 10; - Int_t i2 = i%10; i /= 10; - Int_t i3 = i%10; i /= 10; + Int_t i1 = i%10; i /= 10; + Int_t i2 = i%10; i /= 10; + Int_t i3 = i%10; i /= 10; Int_t i4 = i%10; //printf("pdg(%d) quark indices (%d,%d,%d,%d,%d) \n",pdg, i4,i3,i2, i1, i0); // meson @@ -186,7 +186,7 @@ kine_track(Int_t label, Warning("kine_track", "label not set."); return 0; } - + AliRunLoader* rl = AliEveEventManager::AssertRunLoader(); rl->LoadKinematics(); AliStack* stack = rl->Stack(); @@ -201,7 +201,7 @@ kine_track(Int_t label, if (import_mother || (import_daughters && p->GetNDaughters())) { TEveTrack* toptrack = 0; - TEveTrackList* tracklist = 0; + TEveTrackList* tracklist = 0; TEveTrackPropagator* rs = 0; if (cont == 0) @@ -239,7 +239,7 @@ kine_track(Int_t label, if (import_mother) { - TEveTrack* track = new TEveTrack(p, label, rs); + TEveTrack* track = new TEveTrack(p, label, rs); char form[1000]; sprintf(form,"%s [%d]", p->GetName(), label); track->SetName(form); @@ -251,12 +251,12 @@ kine_track(Int_t label, cont = track; } - if (import_daughters && p->GetNDaughters()) + if (import_daughters && p->GetNDaughters()) { - for (int d=p->GetFirstDaughter(); d>0 && d<=p->GetLastDaughter(); ++d) - { + for (int d=p->GetFirstDaughter(); d>0 && d<=p->GetLastDaughter(); ++d) + { TParticle* dp = stack->Particle(d); - TEveTrack* track = new TEveTrack(dp, d, rs); + TEveTrack* track = new TEveTrack(dp, d, rs); char form[1000]; sprintf(form,"%s [%d]", dp->GetName(), d); track->SetName(form); diff --git a/EVE/alice-macros/phos_clusters.C b/EVE/alice-macros/phos_clusters.C index 6b7078d7b18..ef3937e5148 100644 --- a/EVE/alice-macros/phos_clusters.C +++ b/EVE/alice-macros/phos_clusters.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* phos_clusters(TEveElement* cont=0) diff --git a/EVE/alice-macros/pmd_digits.C b/EVE/alice-macros/pmd_digits.C index bc2bcbd23a9..cf33d7b11cc 100644 --- a/EVE/alice-macros/pmd_digits.C +++ b/EVE/alice-macros/pmd_digits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // ---------------------------------------------------------------------- // void pmd_digits(Int_t mode = 0) @@ -85,11 +85,11 @@ void pmd_digits(Int_t mode = 0) iendDDL = 6; zpos = 360.; } - + TEveElementList* lplane = new TEveElementList(spl.Data()); // l->SetMainColor((Color_t)3); gEve->AddElement(lplane, l); - + for (Int_t iddl = istartDDL; iddl < iendDDL; iddl++) { sddl = bsddl; @@ -111,7 +111,7 @@ void pmd_digits(Int_t mode = 0) for (Int_t ism = 0; ism < NSM; ism++) { - + AliEvePMDModule *lmodule = new AliEvePMDModule(); lmodule->SetPosition(0.,0.,zpos); lmodule->DisplayDigitsData(modnumber, pmdt); diff --git a/EVE/alice-macros/pmd_hits.C b/EVE/alice-macros/pmd_hits.C index c1580a04e0a..a295f440a9c 100644 --- a/EVE/alice-macros/pmd_hits.C +++ b/EVE/alice-macros/pmd_hits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* @@ -15,7 +15,7 @@ pmd_hits(const char *varexp = "fX:fY:fZ", rl->LoadHits("PMD"); TTree* ht = rl->GetTreeH("PMD", false); - + //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT //PH on some platforms (alphalinuxgcc, solariscc5, etc.) diff --git a/EVE/alice-macros/pmd_raw.C b/EVE/alice-macros/pmd_raw.C index 390dd3d502f..180e5b527b6 100644 --- a/EVE/alice-macros/pmd_raw.C +++ b/EVE/alice-macros/pmd_raw.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // ---------------------------------------------------------------------- // void pmd_raw(Int_t mode = 0) @@ -29,7 +29,7 @@ void pmd_raw(Int_t mode = 0) // l->SetTitle("PMD"); // l->SetMainColor((Color_t)3); gEve->AddElement(l); - + Int_t NSM = 0; Int_t istartDDL = 0; Int_t iendDDL = 0; @@ -45,7 +45,7 @@ void pmd_raw(Int_t mode = 0) iendPlane = 1; printf("--- Visualization is set for PREshower Plane ---\n"); break; - + case 1: istartPlane = 1; iendPlane = 2; @@ -57,7 +57,7 @@ void pmd_raw(Int_t mode = 0) iendPlane = 2; printf("--- Visualization is set for both the Plane ---\n"); break; - + default: printf("--- Not set for any Plane ---\n"); } @@ -79,11 +79,11 @@ void pmd_raw(Int_t mode = 0) iendDDL = 6; zpos = 360.; } - + TEveElementList* lplane = new TEveElementList(spl.Data()); // l->SetMainColor((Color_t)3); gEve->AddElement(lplane, l); - + for (Int_t iddl = istartDDL; iddl < iendDDL; iddl++) //for (Int_t iddl = 0; iddl < 1; iddl++) { diff --git a/EVE/alice-macros/primary_vertex.C b/EVE/alice-macros/primary_vertex.C index 02c6cfb2650..d1fe028935c 100644 --- a/EVE/alice-macros/primary_vertex.C +++ b/EVE/alice-macros/primary_vertex.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TPolyMarker3D* make_vertex_marker(AliESDVertex* v, const Text_t* name ) @@ -80,7 +80,7 @@ void primary_vertex_primitive(Bool_t showSPD=kTRUE, Bool_t showBoxes=kFALSE) /**************************************************************************/ TEveStraightLineSet* ESDvertex_lineset(AliESDVertex* v, const Text_t* name) -{ +{ Double_t x[3], e[3]; v->GetXYZ(x); v->GetSigmaXYZ(e); printf("%16s: %f %f %f - %f %f %f\n", name, @@ -89,7 +89,7 @@ TEveStraightLineSet* ESDvertex_lineset(AliESDVertex* v, const Text_t* name) // dimensions TEveStraightLineSet* ls = new TEveStraightLineSet(); ls->SetName(name); - ls->AddLine(e[0], 0, 0, -e[0], 0, 0); + ls->AddLine(e[0], 0, 0, -e[0], 0, 0); ls->AddLine(0, e[1], 0, 0, -e[1], 0); ls->AddLine(0, 0, e[2], 0, 0, -e[2]); for(Int_t i =0; i < 3; i++) @@ -101,7 +101,7 @@ TEveStraightLineSet* ESDvertex_lineset(AliESDVertex* v, const Text_t* name) // centre marker ls->AddMarker(0, 0.5); ls->RefHMTrans().SetPos(x); - return ls; + return ls; } void make_vertex_ellipses(TEveStraightLineSet* ls, AliESDVertex* v, Bool_t ellipseUseSigma) @@ -132,22 +132,22 @@ void make_vertex_ellipses(TEveStraightLineSet* ls, AliESDVertex* v, Bool_t ellip a = e[0]; b = e[1]; for (Int_t i = 0; iAddLine(a*TMath::Cos(i*S) , b*TMath::Sin(i*S) , 0, + ls->AddLine(a*TMath::Cos(i*S) , b*TMath::Sin(i*S) , 0, a*TMath::Cos(i*S+S), b*TMath::Sin(i*S+S), 0); a = e[0]; b = e[2]; for (Int_t i = 0; iAddLine(a*TMath::Cos(i*S) , 0, b*TMath::Sin(i*S), + ls->AddLine(a*TMath::Cos(i*S) , 0, b*TMath::Sin(i*S), a*TMath::Cos(i*S+S), 0, b*TMath::Sin(i*S+S)); a = e[1]; b = e[2]; for (Int_t i = 0; iAddLine(0, a*TMath::Cos(i*S) , b*TMath::Sin(i*S), + ls->AddLine(0, a*TMath::Cos(i*S) , b*TMath::Sin(i*S), 0, a*TMath::Cos(i*S+S), b*TMath::Sin(i*S+S)); } void primary_vertex(Bool_t showSPD=kTRUE, Bool_t rnrEllipse=kTRUE) -{ +{ AliESDEvent* esd = AliEveEventManager::AssertESD(); TEveStraightLineSet* ls; @@ -156,7 +156,7 @@ void primary_vertex(Bool_t showSPD=kTRUE, Bool_t rnrEllipse=kTRUE) if (rnrEllipse) make_vertex_ellipses(ls, PV, kTRUE); gEve->AddElement(ls); - if (showSPD) + if (showSPD) { AliESDVertex* SPDV = esd->GetVertex(); ls = ESDvertex_lineset(SPDV, "SPD Vertex"); diff --git a/EVE/alice-macros/primary_vertex_tracks.C b/EVE/alice-macros/primary_vertex_tracks.C index 91ba67359c2..e0b048e268c 100644 --- a/EVE/alice-macros/primary_vertex_tracks.C +++ b/EVE/alice-macros/primary_vertex_tracks.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEveTrackList* primary_vertex_tracks() { @@ -12,7 +12,7 @@ TEveTrackList* primary_vertex_tracks() AliESDEvent *esd = AliEveEventManager::AssertESD(); AliESDVertex *pv = esd->GetPrimaryVertex(); - TEveTrackList* cont = new TEveTrackList("Tracks for Primary Vertex"); + TEveTrackList* cont = new TEveTrackList("Tracks for Primary Vertex"); cont->SetMainColor(Color_t(7)); TEveTrackPropagator* rnrStyle = cont->GetPropagator(); rnrStyle->SetMagField( esd->GetMagneticField() ); diff --git a/EVE/alice-macros/print_kine_from_label.C b/EVE/alice-macros/print_kine_from_label.C index 2309d7015be..d1856645a6c 100644 --- a/EVE/alice-macros/print_kine_from_label.C +++ b/EVE/alice-macros/print_kine_from_label.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void print_kine_from_label(Int_t label) { diff --git a/EVE/alice-macros/region_marker.C b/EVE/alice-macros/region_marker.C index 3ba9b937485..845f1ba66f5 100644 --- a/EVE/alice-macros/region_marker.C +++ b/EVE/alice-macros/region_marker.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void region_marker(Float_t a=10, Float_t b=10, Float_t c=20, diff --git a/EVE/alice-macros/t0_digits.C b/EVE/alice-macros/t0_digits.C index 46482326f99..0b5a2a6b955 100644 --- a/EVE/alice-macros/t0_digits.C +++ b/EVE/alice-macros/t0_digits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ namespace Alieve { diff --git a/EVE/alice-macros/t0_hits.C b/EVE/alice-macros/t0_hits.C index ff287d88cf7..93d357c11b5 100644 --- a/EVE/alice-macros/t0_hits.C +++ b/EVE/alice-macros/t0_hits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* @@ -22,10 +22,10 @@ t0_hits(const char *varexp = "T0.fX:T0.fY:T0.fZ", Int_t nTracks = ht->GetEntries(); // printf("Found %d tracks. \n",nTracks); for (Int_t it = 0; it < nTracks; it++) { - + TClonesArray *hits = 0; ht->SetBranchAddress("T0",&hits); - + ht->GetEvent(it); // Int_t nHits = hits->GetEntriesFast(); // printf("Found %d hits in track %d.\n", nHits, it); diff --git a/EVE/alice-macros/t0_raw.C b/EVE/alice-macros/t0_raw.C index 557b1e44e85..c9452956f32 100644 --- a/EVE/alice-macros/t0_raw.C +++ b/EVE/alice-macros/t0_raw.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ namespace Alieve { diff --git a/EVE/alice-macros/tof_digits.C b/EVE/alice-macros/tof_digits.C index 86deb4010e1..f16134596a0 100644 --- a/EVE/alice-macros/tof_digits.C +++ b/EVE/alice-macros/tof_digits.C @@ -4,10 +4,10 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void tof_digits() -{ +{ TClonesArray *array = 0x0; Int_t nDigitsInVolume[3] = {-1, -1, -1}; @@ -27,7 +27,7 @@ void tof_digits() di->Dump(); AliTOFGeometry* g = di->fGeom; - + gStyle->SetPalette(1, 0); gEve->DisableRedraw(); @@ -37,9 +37,9 @@ void tof_digits() gEve->AddElement(ll); for(Int_t iSector=0; iSectorNSectors(); iSector++) { - + array = di->GetDigits(iSector); - + AliEveTOFSector* m = new AliEveTOFSector(localGeoManager,iSector,array); gEve->AddElement(m, ll); diff --git a/EVE/alice-macros/tof_digits_sector.C b/EVE/alice-macros/tof_digits_sector.C index 8ebd6035667..4da6fc827bb 100644 --- a/EVE/alice-macros/tof_digits_sector.C +++ b/EVE/alice-macros/tof_digits_sector.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void tof_digits_sector(Int_t sector=0) { diff --git a/EVE/alice-macros/tof_digits_strips.C b/EVE/alice-macros/tof_digits_strips.C index e8a426abed7..e3fe02f2696 100644 --- a/EVE/alice-macros/tof_digits_strips.C +++ b/EVE/alice-macros/tof_digits_strips.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void tof_digits_strips() { @@ -39,7 +39,7 @@ void tof_digits_strips() TString bsPadZ="PadZ"; TString sPadX; TString bsPadX="PadX"; - + Char_t sectorName[100]; Char_t sectorTitle[200]; diff --git a/EVE/alice-macros/tof_hits.C b/EVE/alice-macros/tof_hits.C index 97eb561054c..800215cfde1 100644 --- a/EVE/alice-macros/tof_hits.C +++ b/EVE/alice-macros/tof_hits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* @@ -16,7 +16,7 @@ tof_hits(const char *varexp = "fX:fY:fZ", rl->LoadHits("TOF"); TTree* ht = rl->GetTreeH("TOF", false); - + //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT //PH on some platforms (alphalinuxgcc, solariscc5, etc.) diff --git a/EVE/alice-macros/tpc_calib_viewer.C b/EVE/alice-macros/tpc_calib_viewer.C index 47ba5415aac..a6b888647f3 100644 --- a/EVE/alice-macros/tpc_calib_viewer.C +++ b/EVE/alice-macros/tpc_calib_viewer.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void tpc_calib_viewer(const char* file="CalibTree.root") { diff --git a/EVE/alice-macros/tpc_clusters.C b/EVE/alice-macros/tpc_clusters.C index 6fccade9b73..a91614ab159 100644 --- a/EVE/alice-macros/tpc_clusters.C +++ b/EVE/alice-macros/tpc_clusters.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifdef __CINT__ @@ -46,7 +46,7 @@ TEvePointSet* tpc_clusters(TEveElement* cont=0, Float_t maxR=270) cTree->SetBranchAddress("Segment", &clrow); Float_t maxRsqr = maxR*maxR; - TClonesArray *cl=clrow->GetArray(); + TClonesArray *cl=clrow->GetArray(); Int_t nentr=(Int_t)cTree->GetEntries(); for (Int_t i=0; iGetEvent(i)) continue; diff --git a/EVE/alice-macros/tpc_digits.C b/EVE/alice-macros/tpc_digits.C index 88a5c3dae75..377b7990b4e 100644 --- a/EVE/alice-macros/tpc_digits.C +++ b/EVE/alice-macros/tpc_digits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include "TGLViewer.h" @@ -54,7 +54,7 @@ void tpc_digits(Int_t mode=1) //TGLViewer* cam = gEve->GetGLViewer(); //cam->SetCurrentCamera(TGLViewer::kCameraOrthoXOY) ; - //cam->SetOrthoCamera(TGLViewer::kCameraOrthoXOY, 2*left, 2*right, 2*top, bottom); + //cam->SetOrthoCamera(TGLViewer::kCameraOrthoXOY, 2*left, 2*right, 2*top, bottom); //printf("%f %f %f %f\n", left, right, top, bottom); break; @@ -67,7 +67,7 @@ void tpc_digits(Int_t mode=1) l->SetTitle("TPC Plate"); l->SetMainColor(Color_t(col)); gEve->AddElement(l); - + for(Int_t i = 0; i<18; i++) { AliEveTPCSector2D* s = new AliEveTPCSector2D(Form("AliEveTPCSector2D %d", i)); s->SetSectorID(i); @@ -113,7 +113,7 @@ void tpc_digits(Int_t mode=1) l->SetTitle("TPC Plate"); l->SetMainColor(Color_t(col)); gEve->AddElement(l); - + for(Int_t i = 0; i<18; i++) { AliEveTPCSector3D* s = new AliEveTPCSector3D(Form("AliEveTPCSector3D %d", i)); s->SetSectorID(i); @@ -171,7 +171,7 @@ void tpc_digits_2drange(Int_t start, Int_t end) TEveElementList* l = new TEveElementList("TPC sectors"); l->SetMainColor(Color_t(col)); gEve->AddElement(l); - + for(Int_t i=start; i<=end; i++) { AliEveTPCSector2D* s = new AliEveTPCSector2D(); s->SetSectorID(i); diff --git a/EVE/alice-macros/tpc_hits.C b/EVE/alice-macros/tpc_hits.C index af74117d0d9..1b76ac8da70 100644 --- a/EVE/alice-macros/tpc_hits.C +++ b/EVE/alice-macros/tpc_hits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* diff --git a/EVE/alice-macros/tpc_hits_charge_split.C b/EVE/alice-macros/tpc_hits_charge_split.C index bc6a43f7cbd..b8dd9eacb7c 100644 --- a/EVE/alice-macros/tpc_hits_charge_split.C +++ b/EVE/alice-macros/tpc_hits_charge_split.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void tpc_hits_charge_split(const char *varexp = @@ -25,7 +25,7 @@ void tpc_hits_charge_split(const char *varexp = l->SetMarkerColor((Color_t)3); l->SetMarkerStyle(20); // full circle l->SetMarkerSize(.5); - + gEve->AddElement(l); l->InitBins("Log Charge", 20, 0, 5); diff --git a/EVE/alice-macros/tpc_hits_eta_split.C b/EVE/alice-macros/tpc_hits_eta_split.C index 579802afe2d..8bea364efab 100644 --- a/EVE/alice-macros/tpc_hits_eta_split.C +++ b/EVE/alice-macros/tpc_hits_eta_split.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void tpc_hits_eta_split(const char *varexp = @@ -25,7 +25,7 @@ void tpc_hits_eta_split(const char *varexp = l->SetMarkerColor((Color_t)3); l->SetMarkerStyle(20); // full circle l->SetMarkerSize(.5); - + gEve->AddElement(l); l->InitBins("Eta", 20, -2, 2); diff --git a/EVE/alice-macros/trd_hits.C b/EVE/alice-macros/trd_hits.C index 1d0d36fbfa9..8ad853b9d86 100644 --- a/EVE/alice-macros/trd_hits.C +++ b/EVE/alice-macros/trd_hits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ TEvePointSet* @@ -16,7 +16,7 @@ trd_hits(const char *varexp = "fX:fY:fZ", rl->LoadHits("TRD"); TTree* ht = rl->GetTreeH("TRD", false); - + //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT //PH on some platforms (alphalinuxgcc, solariscc5, etc.) diff --git a/EVE/alice-macros/trd_hits_z_split.C b/EVE/alice-macros/trd_hits_z_split.C index 0134e248892..6bb74b67c51 100644 --- a/EVE/alice-macros/trd_hits_z_split.C +++ b/EVE/alice-macros/trd_hits_z_split.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void trd_hits_z_split(const char *varexp = "fX:fY:fZ:fZ", @@ -19,7 +19,7 @@ void trd_hits_z_split(const char *varexp = "fX:fY:fZ:fZ", l->SetMarkerColor((Color_t)7); l->SetMarkerStyle(20); // full circle l->SetMarkerSize(.5); - + gEve->AddElement(l); l->InitBins("Z", 20, -360, 360); diff --git a/EVE/alice-macros/vzero_digits.C b/EVE/alice-macros/vzero_digits.C index 2e193b001b7..69829d29247 100644 --- a/EVE/alice-macros/vzero_digits.C +++ b/EVE/alice-macros/vzero_digits.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // fV0CHeight1 = 2.5; // height of cell 1 // fV0CHeight2 = 4.4; // height of cell 2 @@ -43,7 +43,7 @@ void vzero_digits() TEveQuadSet* modL = new TEveQuadSet("V0L"); modL->Reset(TEveQuadSet::kQT_FreeQuad, kFALSE, 32); - + Int_t numEntr = dca->GetEntriesFast(); for (Int_t entr=0; entrLoadHits("VZERO"); TTree* ht = rl->GetTreeH("VZERO", false); - + //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT //PH on some platforms (alphalinuxgcc, solariscc5, etc.) diff --git a/EVE/hlt-macros/command_queue.C b/EVE/hlt-macros/command_queue.C index d5b454ab2aa..0b647c336da 100644 --- a/EVE/hlt-macros/command_queue.C +++ b/EVE/hlt-macros/command_queue.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include #include @@ -115,7 +115,7 @@ void command_queue() #include -void make_crap(void* arg) +void make_crap(void* arg) { Int_t num = 1024; TRandom rnd(0); diff --git a/EVE/hlt-macros/hlt_structs.C b/EVE/hlt-macros/hlt_structs.C index 823a50b81d7..0517ec4f059 100644 --- a/EVE/hlt-macros/hlt_structs.C +++ b/EVE/hlt-macros/hlt_structs.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #include @@ -14,15 +14,15 @@ struct AliHLTTPCSpacePointData //Int_t fTrackID[3]; //#endif Float_t fX; //==fPadRow in local system - Float_t fY; + Float_t fY; Float_t fZ; UInt_t fID; //contains slice patch and number UChar_t fPadRow; Float_t fSigmaY2; //error (former width) of the clusters Float_t fSigmaZ2; //error (former width) of the clusters UInt_t fCharge; - Bool_t fUsed; // only used in AliHLTTPCDisplay - Int_t fTrackN; // only used in AliHLTTPCDisplay + Bool_t fUsed; // only used in AliHLTTPCDisplay + Int_t fTrackN; // only used in AliHLTTPCDisplay }; struct AliHLTTPCClusterData diff --git a/EVE/hlt-macros/homer_display.C b/EVE/hlt-macros/homer_display.C index a9ac5a806ef..a31e61eba2a 100644 --- a/EVE/hlt-macros/homer_display.C +++ b/EVE/hlt-macros/homer_display.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // Functions to read data from HOMER. @@ -81,7 +81,7 @@ void homer_display() homerM->SelectESDTPC(); homerM->ConnectHOMER(); - memreader = new AliRawReaderMemory(0, 0); + memreader = new AliRawReaderMemory(0, 0); gStyle->SetPalette(1, 0); loader = new AliEveTPCLoader; @@ -204,7 +204,7 @@ TEveTrack* esd_make_track(TEveTrackPropagator* rnrStyle, rt.P.Set(pbuf); Double_t ep = at->GetP(), mc = at->GetMass(); rt.beta = ep/TMath::Sqrt(ep*ep + mc*mc); - + TEveTrack* track = new TEveTrack(&rt, rnrStyle); //PH The line below is replaced waiting for a fix in Root //PH which permits to use variable siza arguments in CINT @@ -303,7 +303,7 @@ root [10] tpc_trk->SelectByPt(0,1000000000000) root [11] tpc_trk->MakeTracks( void MakeTracks(Bool_t recurse = kTRUE) root [11] tpc_trk->MakeTracks() -root [12] +root [12] diff --git a/EVE/hlt-macros/rootlogon.C b/EVE/hlt-macros/rootlogon.C index ce6c65d334b..2e201dbe591 100644 --- a/EVE/hlt-macros/rootlogon.C +++ b/EVE/hlt-macros/rootlogon.C @@ -4,11 +4,11 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ { - + cout << "Setting include path ..." << endl; TString includePath = "-I${ALICE_ROOT}/include "; includePath += "-I${ALICE_ROOT}/EVE "; diff --git a/EVE/macros/alieve_create_vsd.C b/EVE/macros/alieve_create_vsd.C index 97b13e165bb..7b83756c13f 100644 --- a/EVE/macros/alieve_create_vsd.C +++ b/EVE/macros/alieve_create_vsd.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void alieve_create_vsd() { diff --git a/EVE/macros/alieve_init.C b/EVE/macros/alieve_init.C index a629c238da4..7c6dadfdb22 100644 --- a/EVE/macros/alieve_init.C +++ b/EVE/macros/alieve_init.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ #ifndef __CINT_ @@ -22,7 +22,7 @@ void alieve_init(const Text_t* path = ".", Int_t event=0, gSystem->cd(hack); // TEveUtil::AssertMacro("region_marker.C"); - + gSystem->ProcessEvents(); // Open event diff --git a/EVE/macros/alieve_loadlibs.C b/EVE/macros/alieve_loadlibs.C index 565302640ef..f867a78a13a 100644 --- a/EVE/macros/alieve_loadlibs.C +++ b/EVE/macros/alieve_loadlibs.C @@ -4,10 +4,10 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ -void alieve_loadlibs () +void alieve_loadlibs () { // Macro which loads the libraries needed for simulation and reconstruction @@ -34,7 +34,7 @@ void alieve_loadlibs () gSystem->Load("libESD"); gSystem->Load("libSTEER"); - + gSystem->Load("libRAWDatabase"); gSystem->Load("libRAWDatarec"); diff --git a/EVE/macros/isegv.C b/EVE/macros/isegv.C index cc18d02dbd3..0e61f0978e4 100644 --- a/EVE/macros/isegv.C +++ b/EVE/macros/isegv.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // Cause ROOT to properly crash and dump core on SigSEGV. diff --git a/EVE/macros/trackcount_init.C b/EVE/macros/trackcount_init.C index 7b9b8b7bf8c..b455da79ee2 100644 --- a/EVE/macros/trackcount_init.C +++ b/EVE/macros/trackcount_init.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ void trackcount_init() diff --git a/EVE/test-macros/tpc_digi_test.C b/EVE/test-macros/tpc_digi_test.C index cd30d2164ee..ef528a69685 100644 --- a/EVE/test-macros/tpc_digi_test.C +++ b/EVE/test-macros/tpc_digi_test.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ class TTree; @@ -47,7 +47,7 @@ void tpc_digi_pad_dump(Int_t s, Int_t r, Int_t p) AliSimDigits *digit = 0; tree->GetBranch("Segment")->SetAddress(&digit); - + Int_t sbr = (Int_t) tree->GetEntries(); for (Int_t ent=0; entGetEntry(ent); diff --git a/EVE/test-macros/tpc_gui.C b/EVE/test-macros/tpc_gui.C index 604882b1dd9..a35bb260ebd 100644 --- a/EVE/test-macros/tpc_gui.C +++ b/EVE/test-macros/tpc_gui.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // Function to spawn a gui for reading rootified raw-data from TPC sector test. diff --git a/EVE/test-macros/tpc_gui_hack.C b/EVE/test-macros/tpc_gui_hack.C index 29087a90199..804a7242f3f 100644 --- a/EVE/test-macros/tpc_gui_hack.C +++ b/EVE/test-macros/tpc_gui_hack.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // Function to spawn a gui for reading rootified raw-data from TPC sector test. diff --git a/EVE/test-macros/tpc_raw_test.C b/EVE/test-macros/tpc_raw_test.C index 580304df847..3b2ddb025cf 100644 --- a/EVE/test-macros/tpc_raw_test.C +++ b/EVE/test-macros/tpc_raw_test.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ class AliRawReaderFile; diff --git a/EVE/test-macros/tpc_sector_raw_test.C b/EVE/test-macros/tpc_sector_raw_test.C index 0360c2d330f..f96277fd693 100644 --- a/EVE/test-macros/tpc_sector_raw_test.C +++ b/EVE/test-macros/tpc_sector_raw_test.C @@ -4,7 +4,7 @@ /************************************************************************** * Copyright(c) 1998-2008, ALICE Experiment at CERN, all rights reserved. * * See http://aliceinfo.cern.ch/Offline/AliRoot/License.html for * - * full copyright notice. * + * full copyright notice. * **************************************************************************/ // Functions to read rootified raw-data from TPC sector test.