- Add information in the trigger chamber efficiency object in order to take into...

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

diff --git a/PMD/AliPMDCalibrator.cxx b/PMD/AliPMDCalibrator.cxx
index 52030d7017364fbf1685158f87f16089a5218b6c..921a284d1c72c03ea434983294dad3fb702ddb84 100644 (file)
--- a/PMD/AliPMDCalibrator.cxx
+++ b/PMD/AliPMDCalibrator.cxx
@@ -149,7 +149,7 @@ void AliPMDCalibrator::Init()
   char htitle1[120];
   
   for(Int_t d = 0; d < kDet; d++) {
-    sprintf(hname2,"Isolated cell adc for Det Plane %d",d);//sid
+    sprintf(hname2,"Isolated cell adc for Det Plane %d",d);
     fHdetIso[d]= new TH1F(hname2,htitle2,100,0,1000);
     for(Int_t i1 = 0; i1 < kMaxSMN; i1++) {
       sprintf(hname,"det_%d_iso_sm_%2d",d,i1);
@@ -256,14 +256,14 @@ void AliPMDCalibrator::CalculateIsoCell()
              // Pedestal Subtraction
              Int_t   pedmeanrms = 
                fCalibPed->GetPedMeanRms(idet,ismn,irow,icol);
-             Int_t   pedrms1    = (Int_t) pedmeanrms%1000;
+             Int_t   pedrms1    = (Int_t) pedmeanrms%100;
              Float_t pedrms     = (Float_t)pedrms1/10.;
              Float_t pedmean    = (Float_t) (pedmeanrms - pedrms1)/1000.0;
              Float_t isig = isig1 - (pedmean + 3.0*pedrms);
              if (isig>0)
                {
                  d1[idet][ismn][irow][icol] = (Int_t)isig;
-                 nhitcell[idet][ismn][irow][icol] += 1; //sid
+                 nhitcell[idet][ismn][irow][icol] += 1; 
                }
            }//ient loop
          pmdddlcont.Clear();
@@ -362,8 +362,9 @@ void AliPMDCalibrator::CalculateIsoCell()
            {
              for(Int_t k1 = 0; k1 < kMaxCol; k1++)
                {
-                 if(nhitcell[det1][i1][j1][k1]< nhitcut[det1][i1])//sid
-                   {
+                if(nhitcell[det1][i1][j1][k1]> nhitcut[det1][i1]) fGainFact[det1][i1][j1][k1]=-99.0;
+                  if(nhitcell[det1][i1][j1][k1]< nhitcut[det1][i1])
+                    {
                      isoMean[det1][i1][j1][k1]=fHadcIso[det1][i1][j1][k1]->
                        GetMean();
                      if(isoMean[det1][i1][j1][k1]>0.0 && histMean[det1][i1]>0.0)
@@ -371,9 +372,14 @@ void AliPMDCalibrator::CalculateIsoCell()
                          fGainFact[det1][i1][j1][k1]=
                            isoMean[det1][i1][j1][k1]/(histMean[det1][i1]*
                                                     smNormFactor[det1][i1]);
+
                        }
-                   }                              
+                   }   
+                  Float_t gain = fGainFact[det1][i1][j1][k1];
+                  fCalibGain->SetGainFact(det1,i1,j1,k1,gain);
                }
+                          
+                       
            }
        }
     }
@@ -384,9 +390,9 @@ void AliPMDCalibrator::CalculateIsoCell()
 Bool_t AliPMDCalibrator::Store()
 {
   AliCDBManager *man = AliCDBManager::Instance();
-  //man->SetDefaultStorage("local://$ALICE_ROOT");
+  //man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   if(!man->IsDefaultStorageSet()) return kFALSE;
-  AliCDBId id("PMD/Calib/Gain",0,0);
+  AliCDBId id("PMD/Calib/Gain",0,999999999);
   AliCDBMetaData md;
   md.SetBeamPeriod(0);
   md.SetComment("Test");