PWGCF/Correlations converted to native cmake

[u/mrichter/AliRoot.git] / PWGCF / Correlations / JCORRAN / AliJHistManager.cxx

diff --git a/PWGCF/Correlations/JCORRAN/AliJHistManager.cxx b/PWGCF/Correlations/JCORRAN/AliJHistManager.cxx
index 09b603ea8cadef8b3845671b84dd4b063bdf7b65..35e9507278bfb179107b38e23fd3596b12dae6b8 100644 (file)
--- a/PWGCF/Correlations/JCORRAN/AliJHistManager.cxx
+++ b/PWGCF/Correlations/JCORRAN/AliJHistManager.cxx
@@ -1,4 +1,5 @@
 #include "AliJHistManager.h"
+#include <TMath.h>
 using namespace std;
 //////////////////////////////////////////////////////
 //  AliJBin
@@ -156,13 +157,13 @@ AliJBin& AliJBin::SetBin(const int  n){
 }
 //_____________________________________________________
 void AliJBin::AddBin( const TString& v ){
-    if( fIsFixedBin ) { JERROR( "You can't Add Bin"); }
+    if( fIsFixedBin ) { JERROR( "You can't Add Bini "+GetName()); }
     fBinStr.push_back( (v=="_")?"":v );
     fBinD.push_back( v.Atof() );
 }
 //_____________________________________________________
 void AliJBin::AddBin( float v ){
-    if( fIsFixedBin ) { JERROR( "You can't Add Bin"); }
+    if( fIsFixedBin ) { JERROR( "You can't Add Bin "+GetName()); }
     fBinD.push_back( v ); 
     fBinStr.push_back(Form("%f",v));
 }
@@ -189,6 +190,12 @@ void AliJBin::Print(){
     std::cout<<"*"+GetString()<<std::endl;
 }
 
+int AliJBin::GetBin(double x){
+  int i =  TMath::BinarySearch( fBinD.size(), &fBinD[0], x ); 
+  if( fMode == kRange && i+1 >= int(fBinD.size()) ) return -1;
+  return i;
+}
+
 //////////////////////////////////////////////////////
 // AliJArrayBase 
 //////////////////////////////////////////////////////
@@ -615,20 +622,6 @@ bool AliJTH1::IsLoadMode(){
 }
 
 
-//////////////////////////////////////////////////////////////////////////
-//                                                                      //
-// AliJTH1Derived                                                       //
-//                                                                      //
-//////////////////////////////////////////////////////////////////////////
-template< typename T>
-AliJTH1Derived<T>::AliJTH1Derived():
-    AliJTH1(), fPlayer(this)
-{
-}
-template< typename T>
-AliJTH1Derived<T>::~AliJTH1Derived(){
-}
-
 
 
 
@@ -653,8 +646,8 @@ AliJHistManager::AliJHistManager(TString name):
     fHistConfigs(0)
 {
     // constructor
-    //CurrentManager(this);
     fDirectory = gDirectory;
+    this->cd();
 }
 
 //_____________________________________________________
@@ -690,7 +683,7 @@ AliJHistManager* AliJHistManager::GlobalManager(){
 }
 
 AliJHistManager* AliJHistManager::CurrentManager( AliJHistManager * hmg){
-    static AliJHistManager* currentManager = AliJHistManager::GlobalManager();
+    static AliJHistManager* currentManager = NULL;//;AliJHistManager::GlobalManager();
     if( hmg ) currentManager = hmg; 
     return currentManager;
 }
@@ -759,7 +752,7 @@ void AliJHistManager::Write(){
 
 void AliJHistManager::WriteConfig(){
     TDirectory *owd = gDirectory;
-    TDirectory * fHistConfigDir = gDirectory->mkdir("HistManager");
+    TDirectory * fHistConfigDir = fDirectory->mkdir("HistManager");
     fHistConfigDir->cd();
     TObjString * config = new TObjString(GetString().Data());
     config->Write("Config");