From f29c0f92d5e2375e2fafd51ec67cf63ce4cc2326 Mon Sep 17 00:00:00 2001 From: "Bastian M. Wojek" Date: Thu, 28 Aug 2008 10:38:27 +0000 Subject: [PATCH] Commented some debugging code. --- .../TFitPofB-lib/classes/TBofZCalc.cpp | 2 +- .../TFitPofB-lib/classes/TLondon1D.cpp | 19 ++--- .../TFitPofB-lib/classes/TPofBCalc.cpp | 4 +- .../TFitPofB-lib/classes/TPofTCalc.cpp | 7 +- src/external/TFitPofB-lib/test/Makefile.test | 4 +- .../TFitPofB-lib/test/TFitPofB_startup.xml | 33 +++++--- src/external/TFitPofB-lib/test/test.cpp | 79 +++++++++++++------ 7 files changed, 91 insertions(+), 57 deletions(-) diff --git a/src/external/TFitPofB-lib/classes/TBofZCalc.cpp b/src/external/TFitPofB-lib/classes/TBofZCalc.cpp index d7a8f542..ce117a36 100644 --- a/src/external/TFitPofB-lib/classes/TBofZCalc.cpp +++ b/src/external/TFitPofB-lib/classes/TBofZCalc.cpp @@ -62,7 +62,7 @@ double TBofZCalc::GetBofZ(double zz) const { } //------------------ -// Constructor of the TLondon1D_1L class +// Constructor of the TLondon1D_HS class // 1D-London screening in a superconducting half-space // Parameters: Bext[G], deadlayer[nm], lambda[nm] //------------------ diff --git a/src/external/TFitPofB-lib/classes/TLondon1D.cpp b/src/external/TFitPofB-lib/classes/TLondon1D.cpp index 65c1f569..075c690a 100644 --- a/src/external/TFitPofB-lib/classes/TLondon1D.cpp +++ b/src/external/TFitPofB-lib/classes/TLondon1D.cpp @@ -5,7 +5,7 @@ Author: Bastian M. Wojek e-mail: bastian.wojek@psi.ch - 2008/06/30 + 2008/08/28 ***************************************************************************/ @@ -28,7 +28,6 @@ ClassImp(TLondon1D3LS) //------------------ TLondon1DHS::~TLondon1DHS() { - cout << "This is the TLondon1DHS-destructor. Jippieh!" << endl; fPar.clear(); fParForBofZ.clear(); fParForPofB.clear(); @@ -40,7 +39,6 @@ TLondon1DHS::~TLondon1DHS() { } TLondon1D1L::~TLondon1D1L() { - cout << "This is the TLondon1D1L-destructor. Jippieh!" << endl; fPar.clear(); fParForBofZ.clear(); fParForPofB.clear(); @@ -52,7 +50,6 @@ TLondon1D1L::~TLondon1D1L() { } TLondon1D2L::~TLondon1D2L() { - cout << "This is the TLondon1D2L-destructor. Jippieh!" << endl; fPar.clear(); fParForBofZ.clear(); fParForPofB.clear(); @@ -64,7 +61,6 @@ TLondon1D2L::~TLondon1D2L() { } TLondon1D3L::~TLondon1D3L() { - cout << "This is the TLondon1D3L-destructor. Jippieh!" << endl; fPar.clear(); fParForBofZ.clear(); fParForPofB.clear(); @@ -76,7 +72,6 @@ TLondon1D3L::~TLondon1D3L() { } TLondon1D3LS::~TLondon1D3LS() { - cout << "This is the TLondon1D3LS-destructor. Jippieh!" << endl; fPar.clear(); fParForBofZ.clear(); fParForPofB.clear(); @@ -93,7 +88,6 @@ TLondon1D3LS::~TLondon1D3LS() { //------------------ TLondon1DHS::TLondon1DHS() : fCalcNeeded(true), fFirstCall(true) { - cout << "This is the TLondon1DHS-constructor. Juhu!" << endl; // read startup file string startup_path_name("TFitPofB_startup.xml"); @@ -156,16 +150,16 @@ double TLondon1DHS::operator()(double t, const vector &par) const { if(fFirstCall){ fPar = par; - for (unsigned int i(0); i 0) { ofstream of(debugfile); - assure(of, debugfile); +// assure(of, debugfile); for (unsigned int i(0); i 0) { ofstream of1(debugfile1); - assure(of1, debugfile1); +// assure(of1, debugfile1); for (unsigned int i(0); i &par) : fWisdom wordsOfWisdomR = fopen(fWisdom.c_str(), "r"); if (wordsOfWisdomR == NULL) { cout << "Couldn't open wisdom file ..." << endl; - } else { + } else { wisdomLoaded = fftw_import_wisdom_from_file(wordsOfWisdomR); fclose(wordsOfWisdomR); } @@ -53,7 +53,8 @@ TPofTCalc::TPofTCalc (const string &wisdom, const vector &par) : fWisdom } fFFTplan = fftw_plan_dft_r2c_1d(fNFFT, fFFTin, fFFTout, FFTW_EXHAUSTIVE); - cout << &fFFTplan << endl; + +// cout << &fFFTplan << endl; } //-------------- diff --git a/src/external/TFitPofB-lib/test/Makefile.test b/src/external/TFitPofB-lib/test/Makefile.test index 9eb05e85..5f018519 100644 --- a/src/external/TFitPofB-lib/test/Makefile.test +++ b/src/external/TFitPofB-lib/test/Makefile.test @@ -12,14 +12,14 @@ LOCALINCLUDE = ../include ROOTINCLUDE = $(ROOTSYS)/include INCLUDES = -I$(LOCALINCLUDE) -I$(ROOTINCLUDE) LD = g++ -LDFLAGS = -g -L../classes -lTFitPofB -lfftw3 -lm +LDFLAGS = -g -L../classes -lTFitPofB -lfftw3 -lm -L/apps/cern/root/lib -lPMusr # the output from the root-config script: CXXFLAGS += $(ROOTCFLAGS) LDFLAGS += # the ROOT libraries -LIBS = $(ROOTLIBS) -lXMLParser +LIBS = $(ROOTLIBS) -lXMLParser -lMathMore EXEC = test diff --git a/src/external/TFitPofB-lib/test/TFitPofB_startup.xml b/src/external/TFitPofB-lib/test/TFitPofB_startup.xml index 57cc1bf7..dfcf3a2d 100644 --- a/src/external/TFitPofB-lib/test/TFitPofB_startup.xml +++ b/src/external/TFitPofB-lib/test/TFitPofB_startup.xml @@ -6,18 +6,31 @@ path/name to the FFTW-wisdom-file and time/field binning (us/G) N_theory determines the number of points in "real space" where the theory function will be calculated - /home/l_wojek/TrimSP/AuYBCO_2005/AuYBCO-500000- - WordsOfWisdom.dat + /home/l_wojek/TrimSP/YBCOxtal/YBCOxtal-500000- + /home/l_wojek/analysis/WordsOfWisdom.dat 0.01 - 0.01 + 0.1 5000 - 04_6 - 09_6 - 14_6 - 18_6 - 21_6 + 03_0 + 03_6 + 05_0 + 05_3 + 07_0 + 07_7 + 08_0 + 09_0 + 10_0 + 10_2 + 12_0 + 14_1 + 16_0 + 16_4 + 18_0 + 19_7 + 20_0 + 22_0 + 24_0 24_6 - 28_7 - + diff --git a/src/external/TFitPofB-lib/test/test.cpp b/src/external/TFitPofB-lib/test/test.cpp index 7b46c39d..20b17fb9 100644 --- a/src/external/TFitPofB-lib/test/test.cpp +++ b/src/external/TFitPofB-lib/test/test.cpp @@ -97,6 +97,24 @@ int main(){ of8.close(); */ +/**************** Test TLondon1DHS *********************************/ + +// unsigned int parNo_arr[] = {1, 2, 5, 7, 9, 10, 11, 12}; + double par_arr[] = {20.0, 24.6, 100.0, 15.0, 140.0}; + +// vector parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); + vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); + +// vector par_vec_sub; + +// for(unsigned int i(0); i