Code for simulation, sdigitization and digitization moved from macros to compiled...

[u/mrichter/AliRoot.git] / PMD / AliPMDDigitizer.cxx

diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx
index 6d9b376295854364590040f32fc2415af3eb86d6..03f6454c44bd74135bd2baad1a954e11973ce37a 100644 (file)
--- a/PMD/AliPMDDigitizer.cxx
+++ b/PMD/AliPMDDigitizer.cxx
@@ -50,9 +50,7 @@
 #include "AliMC.h"
 
 ClassImp(AliPMDDigitizer)
-//
-// Constructor
-//
+
 AliPMDDigitizer::AliPMDDigitizer()
 {
   // Default Constructor
@@ -89,13 +87,12 @@ AliPMDDigitizer::~AliPMDDigitizer()
 //
 // Member functions
 //
-void AliPMDDigitizer::OpengAliceFile(Char_t *file, Option_t *option)
+void AliPMDDigitizer::OpengAliceFile(const char *file, Option_t *option)
 {
   // Loads galice.root file and corresponding header, kinematics
   // hits and sdigits or digits depending on the option
   //
-  fRunLoader = AliRunLoader::Open(file,AliConfig::fgkDefaultEventFolderName,
-                                 "UPDATE");
+  fRunLoader = AliRunLoader::Open(file,AliConfig::fgkDefaultEventFolderName);
   
   if (!fRunLoader)
    {
@@ -168,14 +165,14 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
   Float_t edep;
   Float_t vx = -999.0, vy = -999.0, vz = -999.0;
 
-  
+
   ResetSDigit();
 
   printf("Event Number =  %d \n",ievt); 
   Int_t nparticles = fRunLoader->GetHeader()->GetNtrack();
   printf("Number of Particles = %d \n", nparticles);
   fRunLoader->GetEvent(ievt);
-  fPArray = gAlice->GetMCApp()->Particles();
+  //  fPArray = gAlice->GetMCApp()->Particles();
   // ------------------------------------------------------- //
   // Pointer to specific detector hits.
   // Get pointers to Alice detectors and Hits containers
@@ -197,7 +194,7 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
   if (fPMD) fHits   = fPMD->Hits();
 
   // Start loop on tracks in the hits containers
-  
+
   for (Int_t track=0; track<ntracks;track++) 
     {
       gAlice->ResetHits();
@@ -205,19 +202,15 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
       if (fPMD) 
        {
          npmd = fHits->GetEntriesFast();
-         cout << " npmd = " << npmd << endl;
          for (int ipmd = 0; ipmd < npmd; ipmd++) 
            {
              fPMDHit = (AliPMDhit*) fHits->UncheckedAt(ipmd);
              trackno = fPMDHit->GetTrack();
-
              //  get kinematics of the particles
 
              fParticle = gAlice->GetMCApp()->Particle(trackno);
              trackpid  = fParticle->GetPdgCode();
 
-             cout << " trackno = " << trackno << " track = " << track << endl;
-             //cout << " trackpid = " << trackpid << endl;
              Int_t igatr = -999;
              Int_t ichtr = -999;
              Int_t igapid = -999;
@@ -226,9 +219,6 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
              Int_t idmo = -999;
 
              TParticle*  mparticle = fParticle;
-             Int_t jjnu = mparticle->GetFirstMother();
-             cout << " Coming to this step - step 0 jjnu = " << jjnu << endl;
-             
              Int_t tracknoOld=0, trackpidOld=0, statusOld = 0;
              if (mparticle->GetFirstMother() == -1)
                {
@@ -408,7 +398,6 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt)
   Float_t edep;
   Float_t vx = -999.0, vy = -999.0, vz = -999.0;
 
-  
   ResetDigit();
 
   printf("Event Number =  %d \n",ievt); 
@@ -416,7 +405,7 @@ void AliPMDDigitizer::Hits2Digits(Int_t ievt)
   Int_t nparticles = fRunLoader->GetHeader()->GetNtrack();
   printf("Number of Particles = %d \n", nparticles);
   fRunLoader->GetEvent(ievt);
-  fPArray = gAlice->GetMCApp()->Particles();
+  //  fPArray = gAlice->GetMCApp()->Particles();
   // ------------------------------------------------------- //
   // Pointer to specific detector hits.
   // Get pointers to Alice detectors and Hits containers
@@ -893,8 +882,7 @@ void AliPMDDigitizer::TrackAssignment2Cell()
   //
 }
 
-
-void AliPMDDigitizer::MeV2ADC(Float_t mev, Float_t & adc)
+void AliPMDDigitizer::MeV2ADC(Float_t mev, Float_t & adc) const
 {
   // This converts the simulated edep to ADC according to the
   // Test Beam Data