Changeset 284 in Idarraga

Timestamp:

Apr 20, 2012, 5:11:30 PM (12 years ago)

Author:

idarraga

Message:

 

Location:

mafalda/MPXAlgo

Files:

• MediPixAlgo.cpp (modified) (5 diffs)
• MediPixAlgo.h (modified) (2 diffs)

mafalda/MPXAlgo/MediPixAlgo.cpp

@@ -10 +10 @@
 #include "MediPixAlgo.h"
 #include "MPXStoreGate/CandidateContainer.h"
+#include "MAFTools/MAFTools.h"
 
 ClassImp(MediPixAlgo)
@@ -208 +209 @@
 }
 
+std::map<int,int> MediPixAlgo::GetTOTMap(){
+        return m_myManager->GetTOTMap();
+}
+
 Int_t MediPixAlgo::GetMatrixElement(Int_t col, Int_t row){ 
         return m_myManager->GetMatrixElement(col, row);
 }
 
-std::map<int,int> MediPixAlgo::GetTOTMap(){
-        return m_myManager->GetTOTMap();
-}
-
-Int_t MediPixAlgo::GetMatrixElement(std::pair<UInt_t, Int_t> coordinatesPair){ 
+Int_t MediPixAlgo::GetMatrixElement(std::pair<Int_t, Int_t> coordinatesPair){
         return m_myManager->GetMatrixElement(coordinatesPair.first, coordinatesPair.second);
+}
+
+Int_t MediPixAlgo::GetCalibEnergy(Int_t col, Int_t row){
+        return m_myManager->GetCalibEnergy(MAFTools::XYtoC(col, row, GetWidth()));
+}
+
+void MediPixAlgo::SetCalibEnergy(std::pair<Int_t, Int_t> pix, Double_t e){
+        SetCalibEnergy(pix.first, pix.second, e);
+}
+void MediPixAlgo::SetCalibEnergy(Int_t col, Int_t row, Double_t e){
+        m_myManager->SetCalibEnergy(MAFTools::XYtoC(col, row, GetWidth()), e);
 }
 
@@ -224 +236 @@
 }
 
-Int_t MediPixAlgo::GetLVL1(std::pair<UInt_t, Int_t> coordinatesPair){
+Int_t MediPixAlgo::GetLVL1(std::pair<Int_t, Int_t> coordinatesPair){
         return m_myManager->GetLVL1(coordinatesPair.first, coordinatesPair.second);
 }
@@ -230 +242 @@
 Double_t MediPixAlgo::GetMatrixElementMCEdep(Int_t col, Int_t row){
         return m_myManager->GetMatrixElementMCEdep(col, row);
+}
+
+Double_t MediPixAlgo::GetMatrixElementMCEdep(std::pair<Int_t, Int_t> coordinatesPair){
+        return m_myManager->GetMatrixElementMCEdep(coordinatesPair.first, coordinatesPair.second);
 }
 
@@ -491 +507 @@
 }
 
+// This is a User oriented function.  No consideration here for special objects
 Int_t MediPixAlgo::GetNumberOfObjectsWithAuthor(TString authorName){
+        // !!! WARNING, if there are no hits in the pad, Here we return 0 ! even if there
+        // are service objects !!!
+        if(GetHitsInPad() == 0 ) return 0;
         return m_myManager->GetStoreGate()->GetNObjWithAuthor(authorName);
 }

mafalda/MPXAlgo/MediPixAlgo.h

@@ -45 +45 @@
   OutputMng Log;
   void changeOutputLevel(MSG::Level newL){Log.OutputLevel = newL;};
+  void OutputLevel(MSG::Level newL){changeOutputLevel(newL);}; // same as changeOutputLevel
   void InitMPXAlgo(TString, MediPixAnalysisCore *);
   void PostInitMPXAlgo();
@@ -74 +75 @@
 
   Int_t GetMatrixElement(Int_t col, Int_t row);
-  Int_t GetMatrixElement(std::pair<UInt_t, Int_t>);
+  Int_t GetMatrixElement(std::pair<Int_t, Int_t>);
+
+  // Set pixel map after calibration
+  Int_t GetCalibEnergy(Int_t col, Int_t row);
+  void SetCalibEnergy(std::pair<Int_t, Int_t> pix, Double_t e);
+  void SetCalibEnergy(Int_t col, Int_t row, Double_t e);
 
   Int_t GetLVL1(Int_t col, Int_t row);
-  Int_t GetLVL1(std::pair<UInt_t, Int_t>);
+  Int_t GetLVL1(std::pair<Int_t, Int_t>);
 
   Double_t GetMatrixElementMCEdep(Int_t col, Int_t row);
+  Double_t GetMatrixElementMCEdep(std::pair<Int_t, Int_t>);
 
   UInt_t GetMatrixCropAsBitWord(Int_t, Int_t, Int_t, Int_t);