obsolete macros removed

diff --git a/STEER/AliHits2SDigits.C b/STEER/AliHits2SDigits.C
deleted file mode 100644 (file)
index fd52832..0000000
--- a/STEER/AliHits2SDigits.C
+++ /dev/null
@@ -1,217 +0,0 @@
-////////////////////////////////////////////////////////////////////////
-//
-// name: AliHits2SDigits
-// date: 4.4.2002
-// last update: 4.4.2002
-// author: Jiri Chudoba
-// version: 1.0
-//
-// description: 
-//       creates sdigits for several detectors
-//
-// input:
-//       TString fileName ... galice input file
-//       Int_t nEvents  ... how many events to proceed
-//       Int_t firstEvent  ... first event number
-//       Int_t ITS, TPC, ...   many flags for diff. detectors
-//
-// History:
-//
-// 21.07.03 - changes for NewIO
-//
-// 04.04.02 - first version
-// 
-////////////////////////////////////////////////////////////////////////
-
-#if !defined(__CINT__) || defined(__MAKECINT__)
-#include "iostream.h"
-#include "TTree.h"
-#include "TBranch.h"
-#include "TDirectory.h"
-#include "TFile.h"
-#include "AliRun.h"
-#include "TParticle.h"
-#include "TPC/AliTPCDigitsArray.h"
-#include "AliHeader.h"
-#include "TGeometry.h"
-#include "TObjArray.h"
-#include "TString.h"
-#include "ITS/AliITS.h"
-#include "TPC/AliTPC.h"
-#include "PHOS/AliPHOSSDigitizer.h"
-#include "TRD/AliTRDdigitizer.h"
-#include "TStopwatch.h"
-#include "TRD/AliTRDparameter.h"
-#endif
-
-AliRunLoader* Init(TString fileName);
-
-AliTRDdigitizer *InitTRDdigitizer();
-
-// global variables
-
-TFile *gFileHits = 0;
-Bool_t gSameFiles = kFALSE;
-Int_t gDEBUG = 1;
-
-
-Int_t AliHits2SDigits(TString fileName="galice.root", 
-                  Int_t nEvents = 1, Int_t firstEvent = 0, Int_t iITS = 0,
-                  Int_t iTPC = 0, Int_t iTRD = 0,Int_t iPHOS = 0)
-{
-//
-// Initialization
-//
-  AliRunLoader* rl = Init(fileName);
-  if (!rl) return 1;
-
-// ITS
-  AliITS *ITS = NULL;
-  if (iITS) {
-    ITS  = (AliITS*) gAlice->GetModule("ITS");
-    if (!ITS) {
-      iITS = 0;
-      cerr<<"AliITS object not found on file." << endl;
-    } else if (!ITS->GetITSgeom()) {
-      cerr<<"AliITSgeom not found." << endl;
-      iITS = 0;
-    }
-  }
-
-// TPC
-  AliTPC *TPC = NULL;
-  if (iTPC) {
-    TPC = (AliTPC*)gAlice->GetDetector("TPC");
-    if (!TPC) {
-      iTPC = 0;
-      cerr<<"AliTPC object not found"<<endl;
-    }
-  }
-
-// TRD
-  AliTRDdigitizer *sdTRD = NULL;
-  if (iTRD) {
-    sdTRD = InitTRDdigitizer();
-  }
-
-
-// PHOS
-  AliPHOSSDigitizer *sdPHOS = NULL;
-  if (iPHOS) {
-    sdPHOS = new AliPHOSSDigitizer(fileName.Data());
-  }
-
-
-
-//
-// loop over events
-//
-  TStopwatch timer;
-  timer.Start();
-  for (Int_t iEvent = firstEvent;iEvent<firstEvent+nEvents;iEvent++){
-    rl->GetEvent(iEvent);
-//    gAlice->MakeTree("S",fileSDigits);
-    
-// ITS
-    if (iITS) {
-      if (gDEBUG) {cout<<"  Create ITS sdigits: ";}
-      AliLoader* loader = rl->GetLoader("ITSLoader");
-      if (loader)
-       { 
-        loader->LoadHits("read");
-        loader->LoadSDigits("recreate");
-       if(!loader->TreeS()) loader->MakeTree("S");
-       ITS->MakeBranch("S");
-        ITS->SetTreeAddress();
-        ITS->Hits2SDigits();
-        loader->UnloadHits();
-        loader->UnloadSDigits();
-        if (gDEBUG) {cout<<"done"<<endl;}
-       }
-      else if (gDEBUG) {cout<<"Did not get loader"<<endl;}
-    }
-
-// TPC
-    if (iTPC) {
-      if (gDEBUG) {cout<<"  Create TPC sdigits: ";}
-      AliLoader* loader = rl->GetLoader("TPCLoader");
-      if (loader)
-       { 
-        loader->LoadHits("read");
-        loader->LoadSDigits("recreate");
-      
-       TPC->SetTreeAddress();
-        TPC->SetActiveSectors(1);
-        TPC->Hits2SDigits2(iEvent);
-        loader->UnloadHits();
-        loader->UnloadSDigits();
-        if (gDEBUG) {cout<<"done"<<endl;}
-       }
-      else if (gDEBUG) {cout<<"Did not get loader"<<endl;}
-    }
-
-// TRD
-    if (iTRD) {
-      if (gDEBUG) {cout<<"  Create TRD sdigits: ";}
-      AliLoader* loader = rl->GetLoader("TRDLoader");
-      if (loader)
-       { 
-        loader->LoadHits("read");
-        loader->LoadSDigits("recreate");
-        sdTRD->MakeDigits();
-        sdTRD->WriteDigits();
-        loader->UnloadHits();
-        loader->UnloadSDigits();
-        if (gDEBUG) {cout<<"done"<<endl;}
-       }
-      else if (gDEBUG) {cout<<"Did not get loader"<<endl;}
-    }
-    
-  } // end of loop over events
-
-// PHOS processes always all events
-  if (iPHOS) {
-    sdPHOS->ExecuteTask("deb all");
-  }
-
-//
-// finish 
-//
-  timer.Stop(); 
-  timer.Print();
-
-  delete rl;
-  return 0;
-}
- 
-
-////////////////////////////////////////////////////////////////////////
-AliRunLoader* Init(TString fileName) 
- {
-// open input file, read in gAlice, prepare output file
-  if (gAlice) delete gAlice;
-  gAlice = 0;
-  AliRunLoader*rl = AliRunLoader::Open(fileName);
-  if (rl == 0x0) return 0x0;
-  rl->LoadgAlice();
-  gAlice = rl->GetAliRun();
-  return rl;
- 
-}
-
-
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-AliTRDdigitizer *InitTRDdigitizer() {
-// initialization of TRD digitizer
-  AliTRDdigitizer *sdTRD = new AliTRDdigitizer("TRDdigitizer"
-                                     ,"TRD digitizer class");
-  sdTRD->SetDebug(0);
-  sdTRD->SetSDigits(kTRUE);
-  AliTRDparameter *TRDparam = new AliTRDparameter("TRDparameter"
-                                      ,"TRD parameter class");
-
-  sdTRD->SetParameter(TRDparam);
-  sdTRD->InitDetector();
-  return sdTRD;
-}

diff --git a/STEER/AliMerge.C b/STEER/AliMerge.C
deleted file mode 100644 (file)
index 4941f09..0000000
--- a/STEER/AliMerge.C
+++ /dev/null
@@ -1,73 +0,0 @@
-////////////////////////////////////////////////////////////////////////
-//
-// name: AliMerge
-// date: 21.07.2003
-// last update: 21.07.2003
-// author: Thomas Kuhr
-// version: 1.0
-//
-// description: 
-//    merges sdigits from a signal and a background event
-//    to digits for several detectors
-//    (for advanced features like more input streams see 
-//     AliRunDigitizer.cxx)
-//
-// input:
-//    const char* fileNameSignal : galice file of the signal event
-//    const char* fileNameBkgrd  : galice file of the background event
-//    Int_t nEvents              : how many events to process (<0 means all)
-//    Int_t signalPerBkgrd       : number of signal events merged with 
-//                                 the same background event
-//    Int_t ITS, TPC, ...        : flags for diff. detectors
-//
-// History:
-//
-// 21.07.03 - first version
-// 
-////////////////////////////////////////////////////////////////////////
-
-#if !defined(__CINT__) || defined(__MAKECINT__)
-#include "STEER/AliRun.h"
-#include "STEER/AliRunDigitizer.h"
-#include "ITS/AliITSDigitizer.h"
-#include "ITS/AliITSFDigitizer.h"
-#include "TPC/AliTPCDigitizer.h"
-#include "TRD/AliTRDdigitizer.h"
-#include "PHOS/AliPHOSDigitizer.h"
-#include "MUON/AliMUONDigitizer.h"
-#include "RICH/AliRICHDigitizer.h"
-#include "TStopwatch.h"
-#endif
-
-Bool_t AliMerge(const char* fileNameSignal = "signal/galice.root",
-               const char* fileNameBkgrd = "bkgrd/galice.root",
-               Int_t nEvents = -1, Int_t signalPerBkgrd = 1,
-               Int_t iITS = 0, Int_t iTPC = 0, Int_t iTRD = 0,
-               Int_t iPHOS = 0, Int_t iMUON = 0, Int_t iRICH = 0)
-{
-  if (gAlice) delete gAlice;
-  gAlice = NULL;
-
-  AliRunDigitizer* manager = new AliRunDigitizer(2, signalPerBkgrd);
-  manager->SetInputStream(0, fileNameSignal);
-  manager->SetInputStream(1, fileNameBkgrd);
-  if (nEvents >= 0) manager->SetNrOfEventsToWrite(nEvents);
-
-  if (iITS == 1) new AliITSDigitizer(manager);
-  if (iITS == 2) new AliITSFDigitizer(manager);
-  if (iTPC) new AliTPCDigitizer(manager);
-  if (iTRD) new AliTRDdigitizer(manager);
-  if (iPHOS) new AliPHOSDigitizer(manager);
-  if (iMUON) new AliMUONDigitizer(manager);
-  if (iRICH) new AliRICHDigitizer(manager);
-
-  TStopwatch timer;
-  timer.Start();
-  manager->Exec("deb all");
-  timer.Stop(); 
-  timer.Print();
-
-  delete manager;
-  return kTRUE;
-}
-

diff --git a/STEER/AliSDigits2Digits.C b/STEER/AliSDigits2Digits.C
deleted file mode 100644 (file)
index 37adc0c..0000000
--- a/STEER/AliSDigits2Digits.C
+++ /dev/null
@@ -1,70 +0,0 @@
-////////////////////////////////////////////////////////////////////////
-//
-// name: AliSDigits2Digits
-// date: 4.4.2002
-// last update: 4.4.2002
-// author: Jiri Chudoba
-// version: 1.0
-//
-// description: 
-//       creates digits from sdigits for several detectors
-//
-// input:
-//       TString input ... galice input file
-//       Int_t nEvents  ... how many events to process
-//       Int_t ITS, TPC, ...   many flags for diff. detectors
-//
-// History:
-//
-// 21.07.03 - changes for NewIO
-//
-// 04.04.02 - first version
-// 
-////////////////////////////////////////////////////////////////////////
-
-#if !defined(__CINT__) || defined(__MAKECINT__)
-#include "iostream.h"
-#include "STEER/AliRun.h"
-#include "STEER/AliRunDigitizer.h"
-#include "ITS/AliITSDigitizer.h"
-#include "ITS/AliITSFDigitizer.h"
-#include "TPC/AliTPCDigitizer.h"
-#include "TRD/AliTRDdigitizer.h"
-#include "PHOS/AliPHOSDigitizer.h"
-#include "MUON/AliMUONDigitizer.h"
-#include "RICH/AliRICHDigitizer.h"
-#include "TStopwatch.h"
-#endif
-
-Int_t AliSDigits2Digits(TString input="galice.root", 
-                        Int_t nEvents = 1, Int_t iITS = 0, Int_t iTPC = 0,
-                        Int_t iTRD = 0,  Int_t iPHOS = 0, Int_t iMUON = 0,
-                        Int_t iRICH = 0)
-{
-// delete the current gAlice object, the one from input file
-//  will be used
-
-  if(gAlice){
-    delete gAlice;
-    gAlice = 0;
-  } // end if gAlice
-  AliRunDigitizer * manager = new AliRunDigitizer(1,1);
-  manager->SetDebug(1000);
-  manager->SetInputStream(0,input);
-  
-  manager->SetNrOfEventsToWrite(nEvents);
-  if (iITS == 1) AliITSDigitizer *dITS  = new AliITSDigitizer(manager);
-  if (iITS == 2) AliITSFDigitizer *dITS  = new AliITSFDigitizer(manager);
-  if (iTPC) AliTPCDigitizer *dTPC  = new AliTPCDigitizer(manager);
-  if (iTRD) AliTRDdigitizer *dTRD  = new AliTRDdigitizer(manager);
-  if (iPHOS) AliPHOSDigitizer *dPHOS  = new AliPHOSDigitizer(manager);
-  if (iMUON) AliMUONDigitizer *dMUON  = new AliMUONDigitizer(manager);
-  if (iRICH) AliRICHDigitizer *dRICH  = new AliRICHDigitizer(manager);
-  TStopwatch timer;
-  timer.Start();
-  manager->Exec("deb all");
-  timer.Stop(); 
-  timer.Print();
-  delete manager;
-}
-