Update HFE v2 analyses

[u/mrichter/AliRoot.git] / MUON / AliMUONCDB.cxx

diff --git a/MUON/AliMUONCDB.cxx b/MUON/AliMUONCDB.cxx
index 82de6751b41fefeeb9f94d805e756915d9deb52e..d1a2cb5a665e131d9099ea69521c307f002ca8c5 100644 (file)
--- a/MUON/AliMUONCDB.cxx
+++ b/MUON/AliMUONCDB.cxx
@@ -14,7 +14,7 @@
  **************************************************************************/
 
 /* $Id$ */
-
+ 
 //-----------------------------------------------------------------------------
 /// \namespace AliMUONCDB
 ///
@@ -97,6 +97,12 @@
 #include <sstream>
 #include <set>
 
+using std::endl;
+using std::cout;
+using std::cerr;
+using std::ostringstream;
+using std::ifstream;
+
 namespace
 {
   //_____________________________________________________________________________
@@ -1082,82 +1088,6 @@ AliMUONCDB::WriteToCDB(TObject* object, const char* calibpath, Int_t startRun, I
   AliCDBManager::Instance()->Put(object,id,&md);
 }
 
-//_____________________________________________________________________________
-Int_t 
-AliMUONCDB::MakeNeighbourStore(AliMUONVStore& neighbourStore)
-{
-  /// Fill the neighbours store with, for each channel, a TObjArray of its
-  /// neighbouring pads (including itself)
-  
-  AliCodeTimerAutoGeneral("",0);
-  
-  if (!AliMUONCDB::CheckMapping()) return 0;
-  
-  AliInfoGeneral("AliMUONCDB", "Generating NeighbourStore. This will take a while. Please be patient.");
-  
-  Int_t nchannels(0);
-  
-  TObjArray tmp;
-
-  Int_t detElemId;
-  Int_t manuId;
-  
-  AliMpManuIterator it;
-  
-  while ( it.Next(detElemId,manuId) )
-  {
-    const AliMpVSegmentation* seg = 
-      AliMpSegmentation::Instance()->GetMpSegmentationByElectronics(detElemId,manuId);
-    
-    AliMUONVCalibParam* calibParam = static_cast<AliMUONVCalibParam*>(neighbourStore.FindObject(detElemId,manuId));
-    if (!calibParam)
-    {
-      Int_t dimension(11);
-      Int_t size(AliMpConstants::ManuNofChannels());
-      Int_t defaultValue(-1);
-      Int_t packingFactor(size);
-      
-      calibParam = new AliMUONCalibParamNI(dimension,size,detElemId,manuId,defaultValue,packingFactor);
-      Bool_t ok = neighbourStore.Add(calibParam);
-      if (!ok)
-      {
-        AliErrorGeneral("AliMUONCDB", Form("Could not set DetElemId=%d manuId=%d",detElemId,manuId));
-        return -1;
-      }      
-    }
-    
-    for ( Int_t manuChannel = 0; manuChannel < AliMpConstants::ManuNofChannels(); ++manuChannel )
-    {
-      AliMpPad pad = seg->PadByLocation(manuId,manuChannel,kFALSE);
-      
-      if (pad.IsValid()) 
-      {
-        ++nchannels;
-
-        seg->GetNeighbours(pad,tmp,true,true);
-        Int_t nofPadNeighbours = tmp.GetEntriesFast();
-            
-        for ( Int_t i = 0; i < nofPadNeighbours; ++i )
-        {
-          AliMpPad* p = static_cast<AliMpPad*>(tmp.UncheckedAt(i));
-          Int_t x;
-//          Bool_t ok =
-              calibParam->PackValues(p->GetManuId(),p->GetManuChannel(),x);
-//          if (!ok)
-//          {
-//            AliError("Could not pack value. Something is seriously wrong. Please check");
-//            StdoutToAliError(pad->Print(););
-//            return -1;
-//          }
-          calibParam->SetValueAsInt(manuChannel,i,x);
-        }
-      }
-    }
-    }
-  
-  return nchannels;
-}
-
 //_____________________________________________________________________________
 void
 AliMUONCDB::WriteLocalTriggerMasks(Int_t startRun, Int_t endRun)
@@ -1237,22 +1167,6 @@ AliMUONCDB::WriteTriggerEfficiency(Int_t startRun, Int_t endRun)
   delete eff;
 }
 
-//_____________________________________________________________________________
-void 
-AliMUONCDB::WriteNeighbours(Int_t startRun, Int_t endRun)
-{
-  /// Write neighbours to OCDB
-  
-  AliMUONVStore* neighbours = Create2DMap();
-  Int_t ngenerated = MakeNeighbourStore(*neighbours);
-  AliInfoGeneral("AliMUONCDB", Form("Ngenerated = %d",ngenerated));
-  if (ngenerated>0)
-  {
-    WriteToCDB("MUON/Calib/Neighbours",neighbours,startRun,endRun,true);
-  }
-  delete neighbours;
-}
-
 //_____________________________________________________________________________
 void 
 AliMUONCDB::WriteHV(Bool_t defaultValues,
@@ -1441,7 +1355,6 @@ AliMUONCDB::WriteTracker(Bool_t defaultValues, Int_t startRun, Int_t endRun)
   WritePedestals(defaultValues,startRun,endRun);
   WriteGains(defaultValues,startRun,endRun);
   WriteCapacitances(defaultValues,startRun,endRun);
-  WriteNeighbours(startRun,endRun);
   WriteOccupancyMap(defaultValues,startRun,endRun);
   WriteRejectList(defaultValues,startRun,endRun);
   WriteConfig(startRun,endRun);
@@ -1877,7 +1790,7 @@ void AliMUONCDB::CheckHV(Int_t runNumber, Int_t verbose)
     
     TString name(static_cast<TObjString*>(a->At(0))->String());
     
-    if ( name.Contains("sw") || name.Contains("SUMMARY") ) continue;
+    if ( name.Contains("sw") || name.Contains("SUMMARY") ) {delete a; continue;}
     
     Int_t index = hvNamer.DCSIndexFromDCSAlias(name.Data());
     
@@ -1888,6 +1801,7 @@ void AliMUONCDB::CheckHV(Int_t runNumber, Int_t verbose)
     if (!de)
     {
       AliErrorGeneral("AliMUONCDB::CheckHV",Form("Could not get detElemId from dcsAlias %s",name.Data()));
+      delete a;
       continue;
     }