From 508377217ec8de7e119d4f295bcd88af10829ac7 Mon Sep 17 00:00:00 2001 From: martinez Date: Wed, 17 Sep 2003 15:44:22 +0000 Subject: [PATCH] Independent trigger and cluster reconstruction. Adding Id. Bung in MUONTestTrigger. Update README --- MUON/AliMUONData.cxx | 16 ++++++++++++++++ MUON/AliMUONData.h | 5 +++++ MUON/AliMUONLoader.cxx | 16 ++++++++++++++++ MUON/AliMUONLoader.h | 17 +++++++++++++++++ MUON/MUONrawclusters.C | 1 + MUON/MUONrecoNtuple.C | 19 +++++++++++++++++++ MUON/MUONtrigger.C | 18 ++++++++++++++++++ MUON/README | 30 ++++++++++++++++++++++++------ 8 files changed, 116 insertions(+), 6 deletions(-) diff --git a/MUON/AliMUONData.cxx b/MUON/AliMUONData.cxx index a3e3d707c01..fb7846cd1cd 100644 --- a/MUON/AliMUONData.cxx +++ b/MUON/AliMUONData.cxx @@ -1,3 +1,19 @@ +/************************************************************************** + * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * * + * Author: The ALICE Off-line Project. * + * Contributors are mentioned in the code where appropriate. * + * * + * Permission to use, copy, modify and distribute this software and its * + * documentation strictly for non-commercial purposes is hereby granted * + * without fee, provided that the above copyright notice appears in all * + * copies and that both the copyright notice and this permission notice * + * appear in the supporting documentation. The authors make no claims * + * about the suitability of this software for any purpose. It is * + * provided "as is" without express or implied warranty. * + **************************************************************************/ + +/* $Id$ */ //Root includes #include "TNamed.h" diff --git a/MUON/AliMUONData.h b/MUON/AliMUONData.h index 168459f2202..f54c0cdf00f 100644 --- a/MUON/AliMUONData.h +++ b/MUON/AliMUONData.h @@ -1,6 +1,11 @@ #ifndef ALIMUONDATA_H #define ALIMUONDATA_H // +/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * See cxx source for full Copyright notice */ + +/* $Id$ */ + // AliMUONData // Class containing MUON data: hits, digits, rawclusters, globaltrigger, localtrigger, etc ... // Gines Martinez, Subatech, September 2003 diff --git a/MUON/AliMUONLoader.cxx b/MUON/AliMUONLoader.cxx index 0d668468c68..c64bd577b47 100644 --- a/MUON/AliMUONLoader.cxx +++ b/MUON/AliMUONLoader.cxx @@ -1,3 +1,19 @@ +/************************************************************************** + * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * * + * Author: The ALICE Off-line Project. * + * Contributors are mentioned in the code where appropriate. * + * * + * Permission to use, copy, modify and distribute this software and its * + * documentation strictly for non-commercial purposes is hereby granted * + * without fee, provided that the above copyright notice appears in all * + * copies and that both the copyright notice and this permission notice * + * appear in the supporting documentation. The authors make no claims * + * about the suitability of this software for any purpose. It is * + * provided "as is" without express or implied warranty. * + **************************************************************************/ + +/* $Id$ */ //Root includes diff --git a/MUON/AliMUONLoader.h b/MUON/AliMUONLoader.h index 824a2ad5158..4a70c361b42 100644 --- a/MUON/AliMUONLoader.h +++ b/MUON/AliMUONLoader.h @@ -1,6 +1,23 @@ #ifndef ALIMUONLOADER_H #define ALIMUONLOADER_H +/************************************************************************** + * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * * + * Author: The ALICE Off-line Project. * + * Contributors are mentioned in the code where appropriate. * + * * + * Permission to use, copy, modify and distribute this software and its * + * documentation strictly for non-commercial purposes is hereby granted * + * without fee, provided that the above copyright notice appears in all * + * copies and that both the copyright notice and this permission notice * + * appear in the supporting documentation. The authors make no claims * + * about the suitability of this software for any purpose. It is * + * provided "as is" without express or implied warranty. * + **************************************************************************/ + +/* $Id$ */ + #include "AliLoader.h" //__________________________________________________________________ diff --git a/MUON/MUONrawclusters.C b/MUON/MUONrawclusters.C index f3f6aa7fa8a..11e099a9d62 100644 --- a/MUON/MUONrawclusters.C +++ b/MUON/MUONrawclusters.C @@ -90,6 +90,7 @@ void MUONrawclusters (char* filename="galice.root", Int_t evNumber1=0,Int_t evNu MUONLoader->MakeRecPointsContainer(); else { if (muondata->IsRawClusterBranchesInTree()){ // Test if rawcluster has already been done before + if (ievent==evNumber1) MUONLoader->UnloadRecPoints(); MUONLoader->MakeRecPointsContainer(); // Redoing clusterisation Info("RecPointsContainer","Recreating RecPointsContainer and deleting previous ones"); } diff --git a/MUON/MUONrecoNtuple.C b/MUON/MUONrecoNtuple.C index a358666bb1c..cf7fdbba40e 100644 --- a/MUON/MUONrecoNtuple.C +++ b/MUON/MUONrecoNtuple.C @@ -1,3 +1,22 @@ +/************************************************************************** + * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * * + * Author: The ALICE Off-line Project. * + * Contributors are mentioned in the code where appropriate. * + * * + * Permission to use, copy, modify and distribute this software and its * + * documentation strictly for non-commercial purposes is hereby granted * + * without fee, provided that the above copyright notice appears in all * + * copies and that both the copyright notice and this permission notice * + * appear in the supporting documentation. The authors make no claims * + * about the suitability of this software for any purpose. It is * + * provided "as is" without express or implied warranty. * + **************************************************************************/ + +/* $Id$ */ + + + // Macro MUONrecoNtuple.C (TO BE COMPILED) // for testing the C++ reconstruction code // and producing an Ntuple with reconstructed tracks diff --git a/MUON/MUONtrigger.C b/MUON/MUONtrigger.C index 778ce2679ff..0a2809cb488 100644 --- a/MUON/MUONtrigger.C +++ b/MUON/MUONtrigger.C @@ -1,3 +1,20 @@ +/************************************************************************** + * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * * + * Author: The ALICE Off-line Project. * + * Contributors are mentioned in the code where appropriate. * + * * + * Permission to use, copy, modify and distribute this software and its * + * documentation strictly for non-commercial purposes is hereby granted * + * without fee, provided that the above copyright notice appears in all * + * copies and that both the copyright notice and this permission notice * + * appear in the supporting documentation. The authors make no claims * + * about the suitability of this software for any purpose. It is * + * provided "as is" without express or implied warranty. * + **************************************************************************/ + +/* $Id$ */ + #include "AliRun.h" #include "AliRunLoader.h" #include "AliLoader.h" @@ -49,6 +66,7 @@ void MUONtrigger (char* filename="galice.root", MUONLoader->MakeRecPointsContainer(); else { if (muondata->IsTriggerBranchesInTree()){ // Test if rawcluster has already been done before + if (ievent==evNumber1) MUONLoader->UnloadRecPoints(); MUONLoader->MakeRecPointsContainer(); // Redoing clusterisation Info("RecPointsContainer","Recreating RecPointsContainer and deleting previous ones"); } diff --git a/MUON/README b/MUON/README index fce90fd7687..2f0c8d4d5df 100644 --- a/MUON/README +++ b/MUON/README @@ -1,3 +1,20 @@ +/************************************************************************** + * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * + * * + * Author: The ALICE Off-line Project. * + * Contributors are mentioned in the code where appropriate. * + * * + * Permission to use, copy, modify and distribute this software and its * + * documentation strictly for non-commercial purposes is hereby granted * + * without fee, provided that the above copyright notice appears in all * + * copies and that both the copyright notice and this permission notice * + * appear in the supporting documentation. The authors make no claims * + * about the suitability of this software for any purpose. It is * + * provided "as is" without express or implied warranty. * + **************************************************************************/ + +/* $Id$ */ + ========================================================== Please add to this README file all information concerning config files, simulation, digitalization, clusterization, @@ -40,8 +57,6 @@ MUONrawclusters("galice.root",0,9999); to Load gSystem->Load("$ALICE_ROOT/MUON/MUONrawclusters_C.so") -First event and last event are given by hand, but this will change. - ============================================================ How to run MUON Trigger ============================================================ @@ -49,15 +64,17 @@ First event and last event are given by hand, but this will change. .includepath $ALICE_ROOT/MUON .L $ALICE_ROOT/MUON/MUONtrigger.C++ MUONtrigger("galice.root",0,9999); - +To Load +gSystem->Load("$ALICE_ROOT/MUON/MUONtrigger_C.so") ============================================================ How to run MUON Tracking reconstruction (old output) =========================================================== .includepath $ALICE_ROOT/STEER .includepath $ALICE_ROOT/MUON .L $ALICE_ROOT/MUON/MUONrecoNtuple.C++ -MUONrecoNtuple(0,9999,0,"galice.root") - +MUONrecoNtuple(0,9999,0,"galice.root") +To Load +gSystem->Load("$ALICE_ROOT/MUON/MUONrecoNtuple_C.so") First event and last event are given by hand, but this will change. =========================================================== @@ -67,7 +84,8 @@ First event and last event are given by hand, but this will change. .includepath $ALICE_ROOT/MUON .L $ALICE_ROOT/MUON/MUONTracker.C++ MUONTracker("galice.root",0,9999); - +To Load +gSystem->Load("$ALICE_ROOT/MUON/MUONTracker_C.so") Output in MUON.Tracks.root using the new IO as a TClonesArray of AliMUONTrack -- 2.43.0