new mev-adc conversion

diff --git a/PMD/AliPMDDigitizer.cxx b/PMD/AliPMDDigitizer.cxx
index f8891e67130a5f42b688744cfec9bc2c51a454c3..b0f6155a98976c64412b358957400b0fbc7f98ca 100644 (file)
--- a/PMD/AliPMDDigitizer.cxx
+++ b/PMD/AliPMDDigitizer.cxx
@@ -325,7 +325,6 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
                  statusOld   = -1;
                }
              Int_t igstatus = 0;
-             Int_t trnotemp = trackno;
              //------------------modified by Mriganka ----------------------
              if(ks==1||(imo = mparticle->GetFirstMother())<0 ){
                vx = mparticle->Vx();
@@ -339,31 +338,24 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
              
              while(((imo = mparticle->GetFirstMother()) >= 0)&& 
                    (ks = mparticle->GetStatusCode() <1) )
-             {
+               {
                  mparticle =  gAlice->GetMCApp()->Particle(imo);
                  trackpid = mparticle->GetPdgCode();
                  ks = mparticle->GetStatusCode();
                  vx = mparticle->Vx();
                  vy = mparticle->Vy();
                  vz = mparticle->Vz();
-                 trnotemp = trackno;
-                  if(trackpid == 111)
-                 {
-                     trackno = trnotemp;
-                 }
-                  if(trackpid != 111)
-                 {
-                     trackno = imo;
-                 }
                  
-             }
+                 trackno=imo;
+                               
+                   }
         
-             if(trackpid == kGamma || trackpid == 11 ||
-                trackpid == -11 || trackpid == kPi0) igstatus = 1;
-             mtrackpid = trackpid;
-             mtrackno  = trackno;
-             trackpid  = trackpidOld;
-             trackno   = tracknoOld;
+             if(trackpid==kGamma||trackpid==11||trackpid==-11||
+                trackpid==kPi0)igstatus=1;
+             mtrackpid=trackpid;
+             mtrackno=trackno;
+             trackpid=trackpidOld;
+             trackno=tracknoOld;
              
              //-----------------end of modification----------------
              xPos = fPMDHit->X();
@@ -401,7 +393,7 @@ void AliPMDDigitizer::Hits2SDigits(Int_t ievt)
                }
 
              AliDebug(2,Form("Zposition = %f Edeposition = %f",zPos,edep));
-
+             //Float_t zposition = TMath::Abs(zPos);
              if (zPos < fZPos)
                {
                  // CPV
@@ -1389,10 +1381,15 @@ void AliPMDDigitizer::MeV2ADC(Float_t mev, Float_t & adc) const
   //PS Test in September 2003 and 2006
   // KeV - ADC conversion for 12bit ADC
   // Modified by Ajay
-  const Float_t kConstant   = 9.0809;
-  const Float_t kErConstant = 1.6763;
-  const Float_t kSlope      = 128.348;
-  const Float_t kErSlope    = 0.4703;
+  //const Float_t kConstant   = 9.0809;
+  //const Float_t kErConstant = 1.6763;
+  //const Float_t kSlope      = 128.348;
+  //const Float_t kErSlope    = 0.4703;
+
+  const Float_t kConstant   = -4.5;
+  const Float_t kErConstant = 14.3;
+  const Float_t kSlope      = 68.2;
+  const Float_t kErSlope    = 5.21;
   
   Float_t cons   = gRandom->Gaus(kConstant,kErConstant);
   Float_t slop   = gRandom->Gaus(kSlope,kErSlope);

diff --git a/PMD/AliPMDQADataMakerRec.cxx b/PMD/AliPMDQADataMakerRec.cxx
index 4f2300c671b624500fe3167ac5fc36c976d75dbb..15643a43f8b19994edd90e894c4d873003f190a8 100644 (file)
--- a/PMD/AliPMDQADataMakerRec.cxx
+++ b/PMD/AliPMDQADataMakerRec.cxx
@@ -40,8 +40,6 @@
 #include "AliPMDddldata.h"
 #include "AliPMDUtility.h"
 #include "AliESDPmdTrack.h"
-#include "AliRawReader.h"
-
 //#include "AliPMDRecoParam.h"
 
 ClassImp(AliPMDQADataMakerRec)
@@ -77,7 +75,7 @@ void AliPMDQADataMakerRec::InitRaws()
 {
   // create Raws histograms in Raws subdir
 
-
+  const Bool_t saveForCorr = kTRUE;
     // Preshower plane
 
     TH1I * h0 = new TH1I("hPreEdepM0","ADC Distribution PRE - Module 0", 100, 0, 2000);
@@ -278,9 +276,11 @@ void AliPMDQADataMakerRec::InitRaws()
     // Y vs. X for PRE and CPV planes
 
     TH2F * h48 = new TH2F("hPreXY","PRE plane",200,-100.,100.,200,-100.,100.);
-    Add2RawsList(h48, 48);
+    Add2RawsList(h48, 48,saveForCorr);//Ajay
+    //Add2RawsList(h48, 48);//Ajay
     TH2F * h49 = new TH2F("hCpvXY","CPV plane",200,-100.,100.,200,-100.,100.);
-    Add2RawsList(h49, 49);
+    Add2RawsList(h49, 49,saveForCorr);//Ajay
+    //Add2RawsList(h49, 49);//Ajay
 
 }
 //____________________________________________________________________________ 
@@ -375,8 +375,7 @@ void AliPMDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
 {
     //Fill prepared histograms with Raw digit properties
 
-         rawReader->Reset() ;
-         TObjArray *pmdddlcont = 0x0;
+    TObjArray *pmdddlcont = 0x0;
     pmdddlcont = new TObjArray();
     AliPMDRawStream stream(rawReader);