Removing AliMCProcess and AliMC

diff --git a/AliFluka/TFluka.cxx b/AliFluka/TFluka.cxx
index 52bbb4aab505ec9ead9f8f55757e201081eb7e13..14ef94d2059d799c371e70d827849bbf7d6a0313 100644 (file)
--- a/AliFluka/TFluka.cxx
+++ b/AliFluka/TFluka.cxx
@@ -29,7 +29,7 @@
 #include "AliDecayer.h"
 
 TFluka::TFluka(const char* name, const char* title)
 #include "AliDecayer.h"
 
 TFluka::TFluka(const char* name, const char* title)

-  : AliMC(name, title)
+  : TVirtualMC(name, title)

 {
   // create geometry manager
   fGeometryManager = new TG4GeometryManager();
 {
   // create geometry manager
   fGeometryManager = new TG4GeometryManager();


@@ -478,7 +478,7 @@ void  TFluka::GetSecondary(Int_t isec, Int_t& particleId,
   TG4Globals:: Warning("TFluka::GetSecondary(..) is not implemented."); 
 } 
 
   TG4Globals:: Warning("TFluka::GetSecondary(..) is not implemented."); 
 } 
 

-AliMCProcess TFluka::ProdProcess(Int_t isec) const 
+TMCProcess TFluka::ProdProcess(Int_t isec) const 

 { 
   TG4Globals:: Warning("TFluka::ProdProcess(..) is not implemented."); 
   return kPNoProcess; 
 { 
   TG4Globals:: Warning("TFluka::ProdProcess(..) is not implemented."); 
   return kPNoProcess; 

diff --git a/AliFluka/TFluka.h b/AliFluka/TFluka.h
index 7102be89fde72e2226ed1a05204f1614035ed922..c9d6a25497718438970de9d6b9e34ec7c06f30dc 100644 (file)
--- a/AliFluka/TFluka.h
+++ b/AliFluka/TFluka.h
@@ -12,16 +12,15 @@
 #ifndef TFLUKA_H
 #define TFLUKA_H
 
 #ifndef TFLUKA_H
 #define TFLUKA_H
 

-#include "AliMC.h"
-#include "AliMCProcess.h"
-
+#include "TMCProcess.h"
+#include "TVirtualMC.h"

 #include <TArrayI.h>
 
 class TG4GeometryManager;
 
 class AliDecayer;
 
 #include <TArrayI.h>
 
 class TG4GeometryManager;
 
 class AliDecayer;
 

-class TFluka: public AliMC
+class TFluka: public TVirtualMC

 {
   public:
     TFluka(const char* name, const char* title);
 {
   public:
     TFluka(const char* name, const char* title);


@@ -170,7 +169,7 @@ class TFluka: public AliMC
     virtual Int_t NSecondaries() const;
     virtual void  GetSecondary(Int_t isec, Int_t& particleId, 
                     TLorentzVector& position, TLorentzVector& momentum);
     virtual Int_t NSecondaries() const;
     virtual void  GetSecondary(Int_t isec, Int_t& particleId, 
                     TLorentzVector& position, TLorentzVector& momentum);

-    virtual AliMCProcess ProdProcess(Int_t isec) const; 
+    virtual TMCProcess ProdProcess(Int_t isec) const; 

     virtual Int_t StepProcesses(TArrayI &proc) const;
   
     //
     virtual Int_t StepProcesses(TArrayI &proc) const;
   
     //

diff --git a/EMCAL/AliEMCAL.cxx b/EMCAL/AliEMCAL.cxx
index 4dc06df855c79558bdb105bc608049843d513b90..cb9dbef566d2312118ae2d4b4e3de9865d9a1ca8 100644 (file)
--- a/EMCAL/AliEMCAL.cxx
+++ b/EMCAL/AliEMCAL.cxx
@@ -36,7 +36,6 @@ class TFile;
 
 // --- AliRoot header files ---
 #include "AliEMCAL.h"
 
 // --- AliRoot header files ---
 #include "AliEMCAL.h"

-#include "AliMC.h"

 #include "AliRun.h"
 #include "AliMagF.h"
 #include "AliEMCALGeometry.h"
 #include "AliRun.h"
 #include "AliMagF.h"
 #include "AliEMCALGeometry.h"

diff --git a/EMCAL/AliEMCALJetFinder.cxx b/EMCAL/AliEMCALJetFinder.cxx
index 85b815400fa5c59507512fff158aa569b97b12cf..91e7ff865d59d8bdb008894b9fc13febc0b268b2 100644 (file)
--- a/EMCAL/AliEMCALJetFinder.cxx
+++ b/EMCAL/AliEMCALJetFinder.cxx
@@ -15,6 +15,11 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.28  2002/11/20 14:13:16  morsch
+- FindChargedJets() added.
+- Destructor corrected.
+- Geometry cuts taken from AliEMCALGeometry.
+

 Revision 1.27  2002/11/15 17:39:10  morsch
 GetPythiaParticleName removed.
 
 Revision 1.27  2002/11/15 17:39:10  morsch
 GetPythiaParticleName removed.
 


@@ -140,7 +145,6 @@ Revision 1.3  2002/01/18 05:07:56  morsch
 #include "AliEMCAL.h"
 #include "AliHeader.h"
 #include "AliPDG.h"
 #include "AliEMCAL.h"
 #include "AliHeader.h"
 #include "AliPDG.h"

-#include "AliMC.h"

 
 // Interface to FORTRAN
 #include "Ecommon.h"
 
 // Interface to FORTRAN
 #include "Ecommon.h"

diff --git a/EMCAL/AliEMCALv0.cxx b/EMCAL/AliEMCALv0.cxx
index e77cd5fbd69f8cb74c3d978d34e0dee46ac88d04..e356536aa3b882726995ada1bb0b3238bae8601b 100644 (file)
--- a/EMCAL/AliEMCALv0.cxx
+++ b/EMCAL/AliEMCALv0.cxx
@@ -50,7 +50,6 @@
 #include "AliEMCALGeometry.h"
 #include "AliConst.h"
 #include "AliRun.h"
 #include "AliEMCALGeometry.h"
 #include "AliConst.h"
 #include "AliRun.h"

-#include "AliMC.h"

 
 ClassImp(AliEMCALv0)
 
 
 ClassImp(AliEMCALv0)
 

diff --git a/EMCAL/AliEMCALv1.cxx b/EMCAL/AliEMCALv1.cxx
index 0253ba15a39a03ed44c00fc3baefd6af8061acf9..f90bac4561ee2c530f4c9347707f46c6ac30a55b 100644 (file)
--- a/EMCAL/AliEMCALv1.cxx
+++ b/EMCAL/AliEMCALv1.cxx
@@ -55,7 +55,6 @@
 #include "AliEMCALGeometry.h"
 #include "AliConst.h"
 #include "AliRun.h"
 #include "AliEMCALGeometry.h"
 #include "AliConst.h"
 #include "AliRun.h"

-#include "AliMC.h"

 
 ClassImp(AliEMCALv1)
 
 
 ClassImp(AliEMCALv1)
 

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 76078b0c178649d2754667d12ac5757368c645bd..414c6eb389fd13b2ebf20598227d71fa1e80f1b7 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -14,6 +14,9 @@
  **************************************************************************/
 /*
 $Log$
  **************************************************************************/
 /*
 $Log$

+Revision 1.58  2002/10/21 09:01:33  alibrary
+Getting rid of unused variable
+

 Revision 1.57  2002/10/14 14:57:29  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 
 Revision 1.57  2002/10/14 14:57:29  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 


@@ -266,7 +269,6 @@ Log message added
 #include "AliMUONTriggerDecision.h"
 #include "AliRun.h"
 #include "AliHeader.h"
 #include "AliMUONTriggerDecision.h"
 #include "AliRun.h"
 #include "AliHeader.h"

-#include "AliMC.h"

 #include "AliMUONClusterInput.h"
 #include "AliMUONMerger.h"     
 #include "Riostream.h"
 #include "AliMUONClusterInput.h"
 #include "AliMUONMerger.h"     
 #include "Riostream.h"

diff --git a/MUON/AliMUONproto.cxx b/MUON/AliMUONproto.cxx
index 14dd956be110b05ad2ec876c2a85e38248db03fd..8565890d8d4fbc3b04289d4ca1ff184b186cfdd3 100644 (file)
--- a/MUON/AliMUONproto.cxx
+++ b/MUON/AliMUONproto.cxx
@@ -14,6 +14,9 @@
  **************************************************************************/
 /*
 $Log$
  **************************************************************************/
 /*
 $Log$

+Revision 1.5  2002/10/23 07:24:57  alibrary
+Introducing Riostream.h
+

 Revision 1.4  2001/01/26 20:00:53  hristov
 Major upgrade of AliRoot code
 
 Revision 1.4  2001/01/26 20:00:53  hristov
 Major upgrade of AliRoot code
 


@@ -69,7 +72,6 @@ Both read digits from raw data or use the Monte-Carlo.
 #include "TTUBE.h"
 #include "AliMUONClusterFinder.h"
 #include "AliRun.h"
 #include "TTUBE.h"
 #include "AliMUONClusterFinder.h"
 #include "AliRun.h"

-#include "AliMC.h"

 #include "Riostream.h"
 #include "AliCallf77.h" 
 #include "AliConst.h"
 #include "Riostream.h"
 #include "AliCallf77.h" 
 #include "AliConst.h"


@@ -311,7 +313,6 @@ void AliMUONproto::Init()
    
    //
    // Set the chamber (sensitive region) GEANT identifier
    
    //
    // Set the chamber (sensitive region) GEANT identifier

-   AliMC* gMC = AliMC::GetMC(); 

    ((AliMUONChamber*)(*fChambers)[0])->SetGid(gMC->VolId("C01G"));
 
    printf("\n\n\n Finished Init for Prototype ALICE2 - CPC chamber type\n\n\n");
    ((AliMUONChamber*)(*fChambers)[0])->SetGid(gMC->VolId("C01G"));
 
    printf("\n\n\n Finished Init for Prototype ALICE2 - CPC chamber type\n\n\n");


@@ -606,4 +607,4 @@ void AliMUONproto::SetThreshold()
     
     inputFile.close();    
 }
     
     inputFile.close();    
 }

-#endif
\ No newline at end of file
+#endif

diff --git a/MUON/AliMUONv0.cxx b/MUON/AliMUONv0.cxx
index b86682ace88da53113ed4baa2f5cda8ad5099a34..9e7d985555cf74eb3908147e89b4a777743d6cda 100644 (file)
--- a/MUON/AliMUONv0.cxx
+++ b/MUON/AliMUONv0.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.23  2002/10/23 07:24:57  alibrary
+Introducing Riostream.h
+

 Revision 1.22  2002/10/14 14:57:29  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 
 Revision 1.22  2002/10/14 14:57:29  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 


@@ -97,7 +100,6 @@ Gammas and neutrons are also scored in the stepmanager
 #include "AliMUONv0.h"
 #include "AliMUONChamber.h"
 #include "AliRun.h"
 #include "AliMUONv0.h"
 #include "AliMUONChamber.h"
 #include "AliRun.h"

-#include "AliMC.h"

 #include "AliMagF.h"
 #include "AliMUONHit.h"
 #include "AliMUONPadHit.h"
 #include "AliMagF.h"
 #include "AliMUONHit.h"
 #include "AliMUONPadHit.h"

diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx
index 58c33a00d1e23bc75320a8f1a2cf1db1441008cb..33958284bf902fa02942b5c43df4ced33cbd0068 100644 (file)
--- a/MUON/AliMUONv1.cxx
+++ b/MUON/AliMUONv1.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
 
 /*
 $Log$

+Revision 1.37  2002/10/23 07:24:57  alibrary
+Introducing Riostream.h
+

 Revision 1.36  2002/10/14 14:57:29  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 
 Revision 1.36  2002/10/14 14:57:29  hristov
 Merging the VirtualMC branch to the main development branch (HEAD)
 


@@ -174,7 +177,6 @@ Log messages included.
 
 #include "AliMUONv1.h"
 #include "AliRun.h"
 
 #include "AliMUONv1.h"
 #include "AliRun.h"

-#include "AliMC.h"

 #include "AliMagF.h"
 #include "AliCallf77.h"
 #include "AliConst.h" 
 #include "AliMagF.h"
 #include "AliCallf77.h"
 #include "AliConst.h" 


@@ -2039,7 +2041,6 @@ void AliMUONv1::Init()
    
    //
    // Set the chamber (sensitive region) GEANT identifier
    
    //
    // Set the chamber (sensitive region) GEANT identifier

-   AliMC* gMC = AliMC::GetMC(); 

    ((AliMUONChamber*)(*fChambers)[0])->SetGid(gMC->VolId("S01G"));
    ((AliMUONChamber*)(*fChambers)[1])->SetGid(gMC->VolId("S02G"));
 
    ((AliMUONChamber*)(*fChambers)[0])->SetGid(gMC->VolId("S01G"));
    ((AliMUONChamber*)(*fChambers)[1])->SetGid(gMC->VolId("S02G"));