Fixed the DA so it picks up the pedestals from the right sample

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

diff --git a/PMD/AliPMD.cxx b/PMD/AliPMD.cxx
index c37f422adffa4226d8bac861ea58b898d15e5982..c1954da1da9d205b2942a92fe7c1b7ed6ef937d5 100644 (file)
--- a/PMD/AliPMD.cxx
+++ b/PMD/AliPMD.cxx
@@ -45,6 +45,7 @@
 #include <TTree.h>
 #include <TVirtualMC.h>
 
+#include "AliLog.h"
 #include "AliLoader.h" 
 #include "AliPMDLoader.h" 
 #include "AliPMD.h"
@@ -53,6 +54,7 @@
 #include "AliPMDDigitizer.h"
 #include "AliPMDhit.h"
 #include "AliPMDDDLRawData.h"
+#include "AliPMDRawToSDigits.h"
   
 ClassImp(AliPMD)
  
@@ -108,11 +110,11 @@ AliLoader* AliPMD::MakeLoader(const char* topfoldername)
  
   if (fLoader)
     {
-      cout<<"Success"<<endl;
+      AliDebug(100,"Success");
     }
   else
     {
-      cout<<"Failure"<<endl;
+      AliError("Failure");
     }
 
   return fLoader;
@@ -176,16 +178,6 @@ void AliPMD::BuildGeometry()
   fNodes->Add(node);
 }
 
-//_____________________________________________________________________________
-Int_t AliPMD::DistancetoPrimitive(Int_t , Int_t ) const
-{
-  //
-  // Distance from mouse to detector on the screen
-  // dummy routine
-  //
-   return 9999;
-}
- 
 //_____________________________________________________________________________
 void AliPMD::SetPAR(Float_t p1, Float_t p2, Float_t p3,Float_t p4)
 {
@@ -319,7 +311,7 @@ void AliPMD::Digits2Raw()
   fLoader->LoadDigits();
   TTree* digits = fLoader->TreeD();
   if (!digits) {
-    Error("Digits2Raw", "no digits tree");
+    AliError("No digits tree");
     return;
   }
 
@@ -329,5 +321,15 @@ void AliPMD::Digits2Raw()
   fLoader->UnloadDigits();
 }
 
+Bool_t AliPMD::Raw2SDigits(AliRawReader *rawReader)
+{
+  // converts raw to sdigits
+  AliRunLoader* runLoader = fLoader->GetRunLoader(); 
+  //runLoader->GetEvent(ievt);
 
+  AliPMDRawToSDigits pmdr2sd;
+  pmdr2sd.Raw2SDigits(runLoader, rawReader);
+  fLoader->UnloadSDigits();
+  return kTRUE;
+}