fixing a memory leak

[u/mrichter/AliRoot.git] / FMD / AliFMDPreprocessor.cxx

diff --git a/FMD/AliFMDPreprocessor.cxx b/FMD/AliFMDPreprocessor.cxx
index 8cfd31ea80fe0f2bc24874bdfa928b9a5b0de5d3..9d50b4bf215e36c59a258589ef248b1cc2697e35 100644 (file)
--- a/FMD/AliFMDPreprocessor.cxx
+++ b/FMD/AliFMDPreprocessor.cxx
@@ -58,7 +58,7 @@
 // Latest changes by Christian Holm Christensen
 //
 
-// #include <iostream>
+ #include <iostream>
 
 #include <fstream>
 #include "AliFMDPreprocessor.h"
@@ -142,16 +142,27 @@ UInt_t AliFMDPreprocessor::Process(TMap* /* dcsAliasMap */)
   Bool_t resultRange = kTRUE;
   Bool_t resultRate  = kTRUE;
   Bool_t resultZero  = kTRUE;
-
+  Bool_t infoCalib   = kTRUE;
+  Bool_t resultDead  = kTRUE;
   // Do we need this ?
   // if(!dcsAliasMap) return 1;
   // 
   // Invoking the cdb manager and the FMD parameters class
   // AliCDBManager* cdb   = AliCDBManager::Instance();
-  // cdb->SetDefaultStorage("local://$ALICE_ROOT");
+  // cdb->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
   // cdb->SetRun(0);
+  
+  // Get the run type 
+  TString runType(GetRunType()); 
+  
   AliFMDParameters* pars = AliFMDParameters::Instance();
-  pars->Init(this, false, AliFMDParameters::kAltroMap);
+  if(runType.Contains("PEDESTAL", TString::kIgnoreCase))
+    pars->Init(this, false, AliFMDParameters::kAltroMap|AliFMDParameters::kPulseGain);
+  else if(runType.Contains("GAIN", TString::kIgnoreCase))
+    pars->Init(this, false, AliFMDParameters::kAltroMap|AliFMDParameters::kPedestal);
+  else
+    pars->Init(this, false, AliFMDParameters::kAltroMap);
+  
   // This is if the SOR contains Fee parameters, and we run a DA to
   // extract these parameters.   The same code could work if we get
   // the information from DCS via the FXS 
@@ -159,21 +170,20 @@ UInt_t AliFMDPreprocessor::Process(TMap* /* dcsAliasMap */)
   AliFMDCalibSampleRate*      calibRate  = 0;
   AliFMDCalibStripRange*      calibRange = 0;
   AliFMDCalibZeroSuppression* calibZero  = 0;
-  // Disabled for now. 
-#if 0
+
   if (GetAndCheckFileSources(files, kDAQ,pars->GetConditionsShuttleID()))
-    GetInfoCalibration(files, calibRate, calibRange, calibZero);
+    infoCalib = GetInfoCalibration(files, calibRate, calibRange, calibZero);
+ 
   resultRate  = (!calibRate  ? kFALSE : kTRUE);
   resultRange = (!calibRange ? kFALSE : kTRUE);
   resultZero  = (!calibZero  ? kFALSE : kTRUE);
-#endif
-
-  // Gt the run type 
-  TString runType(GetRunType()); 
+  
 
+  
   //Creating calibration objects
   AliFMDCalibPedestal* calibPed  = 0;
   AliFMDCalibGain*     calibGain = 0;
+  AliFMDCalibDeadMap*  calibDead = 0;
   if (runType.Contains("PEDESTAL", TString::kIgnoreCase)) { 
     if (GetAndCheckFileSources(files, kDAQ, pars->GetPedestalShuttleID())) {
       if(files->GetSize())
@@ -188,6 +198,8 @@ UInt_t AliFMDPreprocessor::Process(TMap* /* dcsAliasMap */)
     }
     resultGain = (calibGain ? kTRUE : kFALSE);
   }
+  if(runType.Contains("PEDESTAL", TString::kIgnoreCase) || runType.Contains("GAIN", TString::kIgnoreCase))
+    calibDead = GetDeadChannelMap(calibPed,calibGain);
   
   //Storing Calibration objects  
   AliCDBMetaData metaData;
@@ -215,13 +227,14 @@ UInt_t AliFMDPreprocessor::Process(TMap* /* dcsAliasMap */)
     resultZero = Store("Calib","ZeroSuppression", calibZero,&metaData,0,kTRUE);
     delete calibZero;
   }
+  if(calibDead) { 
+    resultDead = Store("Calib","Dead", calibDead,&metaData,0,kTRUE);
+    delete calibDead;
+  }
 
-#if 0
-  // Disabled until we implement GetInfoCalibration properly
   Bool_t success = (resultPed && resultGain  && resultRange && 
-                   resultRate  && resultZero);
-#endif
-  Bool_t success = resultPed && resultGain;
+                   resultRate  && resultZero && resultDead && infoCalib);
+  
   Log(Form("FMD preprocessor was %s", (success ? "successful" : "failed")));
   return (success ? 0 : 1);
 }
@@ -241,8 +254,8 @@ AliFMDPreprocessor::GetInfoCalibration(TList* files,
   //     z     On return, newly allocated object 
   // Return: 
   //     kTRUE on success
-  if (!files) return kTRUE; // Should really be false
-  if (files->GetEntries() <= 0) return kTRUE;
+  if (!files) return kFALSE; // Should really be false
+  if (files->GetEntries() <= 0) return kFALSE;
   
   s = new AliFMDCalibSampleRate();
   r = new AliFMDCalibStripRange();
@@ -259,6 +272,8 @@ AliFMDPreprocessor::GetInfoCalibration(TList* files,
       Log(Form("File %s not found!", filename));
       continue;
     }
+    s->ReadFromFile(in);
+    r->ReadFromFile(in);
   }
   return kTRUE;
 }
@@ -294,7 +309,7 @@ AliFMDPreprocessor::GetPedestalCalibration(TList* pedFiles)
     TString header;
     header.ReadLine(in);
     header.ToLower();
-    if(!header.Contains("pedestal")) {
+    if(!header.Contains(pars->GetPedestalShuttleID())) {
       Log("File header is not from pedestal!");
       continue;
     }
@@ -374,7 +389,7 @@ AliFMDPreprocessor::GetGainCalibration(TList* gainFiles)
     TString header;
     header.ReadLine(in);
     header.ToLower();
-    if(!header.Contains("gain")) {
+    if(!header.Contains(pars->GetGainShuttleID())) {
       Log("File header is not from gain!");
       continue;
     }
@@ -419,7 +434,51 @@ AliFMDPreprocessor::GetGainCalibration(TList* gainFiles)
   }
   return calibGain;
 }
+//____________________________________________________________________
+AliFMDCalibDeadMap*    
+AliFMDPreprocessor::GetDeadChannelMap(AliFMDCalibPedestal* pedcalib,
+                                     AliFMDCalibGain*     gaincalib) {
+  //creating dead channel map. '0' means 51200 entries
+  AliFMDCalibDeadMap* deadmap = new AliFMDCalibDeadMap(0);
+  //deadmap->Reset(kTRUE);
+  Float_t noise = 0;
+  Float_t gain  = 0;
+  
+  AliFMDParameters* pars = AliFMDParameters::Instance();
+  //Looping over the channels.
+  for(UShort_t det=1;det<=3;det++) {
+    Int_t nRings = (det==1 ? 1 : 2);
+    for (UShort_t ir = 0; ir < nRings; ir++) {
+      Char_t   ring = (ir == 0 ? 'I' : 'O');
+      UShort_t nsec = (ir == 0 ? 20  : 40);
+      UShort_t nstr = (ir == 0 ? 512 : 256);
+      
+      for(UShort_t sec =0; sec < nsec;  sec++) {
+       
+       for(UShort_t strip = 0; strip < nstr; strip++) {
+         
+         Bool_t isDead = kFALSE;
+         if(pedcalib)
+           noise = pedcalib->Width(det, ring, sec, strip);
+         else 
+           noise = pars->GetPedestalWidth(det, ring, sec, strip);
+       
+         if(gaincalib)
+           gain  = gaincalib->Value(det, ring, sec, strip);
+         else 
+           gain  = pars->GetPulseGain(det, ring, sec, strip);
+         
+         //marking these channels dead.
+         if (gain < 0.5 || gain > 5 || noise > 10 || noise == 0) isDead = kTRUE;
+         
+         deadmap->operator()(det, ring, sec, strip) = isDead;
+       }
+      }
+    }
+  }
 
+  return deadmap;
+}
 //____________________________________________________________________
 //
 // EOF