Import Geant4 10.4.0 source tree

source/analysis/g4tools/include/tools/histo/h2

@@ -139,6 +139,42 @@ public:
     return true;
   }
 
+  bool get_bin_content(bn_t a_ibin,bn_t a_jbin,
+                       TN a_entries,TW a_Sw,TW a_Sw2,
+                       TC a_Sxw,TC a_Sx2w,TC a_Syw,TC a_Sy2w) {
+    if(parent::m_dimension!=2) {
+      a_entries = 0;a_Sw = 0;a_Sw2 = 0;
+      a_Sxw = 0;a_Sx2w = 0;
+      a_Syw = 0;a_Sy2w = 0;
+      return false;
+    }
+    if(a_ibin>(parent::m_axes[0].m_number_of_bins+1)) {
+      a_entries = 0;a_Sw = 0;a_Sw2 = 0;
+      a_Sxw = 0;a_Sx2w = 0;
+      a_Syw = 0;a_Sy2w = 0;
+      return false;
+    }
+    if(a_jbin>(parent::m_axes[1].m_number_of_bins+1)) {
+      a_entries = 0;a_Sw = 0;a_Sw2 = 0;
+      a_Sxw = 0;a_Sx2w = 0;
+      a_Syw = 0;a_Sy2w = 0;
+      return false;
+    }
+
+    TO offset = a_ibin + a_jbin * parent::m_axes[1].m_offset;
+
+    a_entries = parent::m_bin_entries[offset];
+    a_Sw = parent::m_bin_Sw[offset];
+    a_Sw2 = parent::m_bin_Sw2[offset];
+
+    a_Sxw = parent::m_bin_Sxw[offset][0];
+    a_Sx2w = parent::m_bin_Sx2w[offset][0];
+    a_Syw = parent::m_bin_Sxw[offset][1];
+    a_Sy2w = parent::m_bin_Sx2w[offset][1];
+    
+    return true;
+  }
+
   bool add(const h2& a_histo){
     parent::base_add(a_histo);
     return true;
@@ -156,6 +192,16 @@ public:
     return parent::base_divide(a_histo);
   }
 
+  bool equals_TH(const h2& a_from,const TW& a_prec,TW(*a_fabs)(TW)) const {
+    if(!parent::equals_TH(a_from,a_prec,a_fabs,true)) return false;    
+    return true;
+  }
+  
+  void not_a_profile() const {}
+  
+public: //CERN-ROOT API
+  bool Fill(TC aX,TC aY,TW aWeight = 1) {return fill(aX,aY,aWeight);}
+  
 public:
   h2(const std::string& a_title,bn_t aXnumber,TC aXmin,TC aXmax,bn_t aYnumber,TC aYmin,TC aYmax)
   :parent(a_title,aXnumber,aXmin,aXmax,aYnumber,aYmin,aYmax)