Commit 961ff93d authored by Plaszczynski Stephane's avatar Plaszczynski Stephane
Browse files

rename highell's to avoid confusion with chi2

parent f8e2cf3a
#include "CMB/ACT_equat_chi2.hh"
#include "CMB/ACT_equat.hh"
#include "Parser.hh"
#include "paramfile.h"
#include <iostream>
......@@ -8,17 +8,17 @@
using namespace std;
ACTEquatChi2::ACTEquatChi2(const std::string parfile):HighEllChi2(parfile){
ACTEquat::ACTEquat(const std::string parfile):HighEll(parfile){
cout << "ACTEquatChi2 Likelihood for ACT - equat fields " << endl;
cout << "ACTEquatChi2 param file "<< _parfile<<endl;
cout << "ACTEquat Likelihood for ACT - equat fields " << endl;
cout << "ACTEquat param file "<< _parfile<<endl;
paramfile parameters(_parfile);
DefNuisanceNames(_parfile) ;
init_types();
read_window_functions();
if (_verbose>2) cout << "ACTEquatChi2 before read spectra "<<endl;
if (_verbose>2) cout << "ACTEquat before read spectra "<<endl;
read_spectra_data();
if (_verbose>2) cout << "ACTEquatChi2 after read spectra size = "<<_size<<endl;
if (_verbose>2) cout << "ACTEquat after read spectra size = "<<_size<<endl;
_cov_matrix = new HepSymMatrix(_size);
cout << " cov matx name "<< _covName<<endl;
......@@ -98,11 +98,11 @@ ACTEquatChi2::ACTEquatChi2(const std::string parfile):HighEllChi2(parfile){
}
ACTEquatChi2::~ACTEquatChi2(){
ACTEquat::~ACTEquat(){
delete _cov_matrix;
}
int ACTEquatChi2::getType(string freqa, string freqb) {
int ACTEquat::getType(string freqa, string freqb) {
int typ=0;
for (int k=0 ; k< _nfreqs ; k++)
......@@ -114,7 +114,7 @@ int ACTEquatChi2::getType(string freqa, string freqb) {
}
void ACTEquatChi2::init_types(){
void ACTEquat::init_types(){
_ntyp = 0;
for (int k=0 ; k< _nfreqs ; k++){
for (int kk=k ; kk< _nfreqs ; kk++,_ntyp++){
......@@ -135,7 +135,7 @@ void ACTEquatChi2::init_types(){
}
// specific nuisance names
void ACTEquatChi2::DefNuisanceNames( string parfile )
void ACTEquat::DefNuisanceNames( string parfile )
{
char buff[64];
cout << " ACT equat - define nuisance existing "<< _n.size() <<" params "<<endl;
......@@ -159,9 +159,9 @@ void ACTEquatChi2::DefNuisanceNames( string parfile )
}
void ACTEquatChi2::getCovMat(string name){
void ACTEquat::getCovMat(string name){
ifstream file(name.c_str(),ios::in);
if (_verbose>2) cout << " ACTEquatChi2::getCovMat size "<< _size<<endl;
if (_verbose>2) cout << " ACTEquat::getCovMat size "<< _size<<endl;
double a ;
for (int kk=0 ; kk< _size ; kk++)
for (int k=0 ; k< _size ; k++){
......@@ -172,7 +172,7 @@ void ACTEquatChi2::getCovMat(string name){
}
}
string ACTEquatChi2::get_blname(string freqa, string freqb, string parta, string partb){
string ACTEquat::get_blname(string freqa, string freqb, string parta, string partb){
string sname ;
// BblMean_150x150_new.dat
//
......@@ -191,7 +191,7 @@ string ACTEquatChi2::get_blname(string freqa, string freqb, string parta, strin
return(sname);
}
string ACTEquatChi2::get_spname(string freqa, string freqb, string parta, string partb){
string ACTEquat::get_spname(string freqa, string freqb, string parta, string partb){
string name ;
//spt_bandpower_150x150.dat
name = "/spectrum_";
......@@ -210,26 +210,26 @@ string ACTEquatChi2::get_spname(string freqa, string freqb, string parta, string
}
void ACTEquatChi2::buildDustTemplates(int lmin, int lmax){
void ACTEquat::buildDustTemplates(int lmin, int lmax){
vector <double> spdust;
if (_verbose>1)cout << " ACTEquatChi2::buildDustTemplates lmin "<< lmin<<" " << lmax << endl;
if (_verbose>1)cout << " ACTEquat::buildDustTemplates lmin "<< lmin<<" " << lmax << endl;
for (int l=lmin ; l<lmax ; l++){
spdust.push_back( pow(((double)l)/3000.,-0.7) );
}
if (_verbose>2) cout << "ACTEquatChi2::buildDustTemplates "<< spdust.size() << " " << lmin<<" " << lmax << " " << _ntyp << endl;
if (_verbose>2) cout << "ACTEquat::buildDustTemplates "<< spdust.size() << " " << lmin<<" " << lmax << " " << _ntyp << endl;
for (int k=0 ; k<_ntyp ; k++) {
_templ_dust.push_back( spdust );
}
if (_verbose>2) cout << "ACTEquatChi2::buildDustTemplates "<< _templ_dust.size() << endl;
if (_verbose>2) cout << "ACTEquat::buildDustTemplates "<< _templ_dust.size() << endl;
}
vector < vector <double> > ACTEquatChi2::getDust( ){// std::vector<double>& nuisance ) {
vector < vector <double> > ACTEquat::getDust( ){// std::vector<double>& nuisance ) {
vector < vector <double> > temp ( _templ_dust ); // constructeur par copie ?
if (_verbose>2) cout << " ACTEquatChi2 getdust "<< temp.size() << endl;
if (_verbose>2) cout << " ACTEquat getdust "<< temp.size() << endl;
int ityp=0;
double fta,ftb;
for (int k=0 ; k< _nfreqs ; k++) {
......@@ -245,7 +245,7 @@ vector < vector <double> > ACTEquatChi2::getDust( ){// std::vector<double>& nui
return (temp);
}
void ACTEquatChi2::HandleNuisance( std::vector<double>& nuisance){
void ACTEquat::HandleNuisance( std::vector<double>& nuisance){
if (_verbose>2)
cout << " ACT equat handle nuisance "<< nuisance.size()<<" " << _types.size()<<" " << 2+_nfreqs + _nfreqs*(_nfreqs-1) <<endl;
if (_verbose>2)
......
......@@ -6,7 +6,7 @@
#include "CLHEP/Matrix/SymMatrix.h"
#include "CMB/HighEllChi2.hh"
#include "CMB/HighEll.hh"
......@@ -18,11 +18,11 @@
using namespace std;
class ACTEquatChi2 : public HighEllChi2
class ACTEquat : public HighEll
{
public:
ACTEquatChi2(const std::string parfile);
~ACTEquatChi2();
ACTEquat(const std::string parfile);
~ACTEquat();
void DefNuisanceNames( std::string parfile );
void getCovMat(std::string name);
......
#include "CMB/ACT_south_chi2.hh"
#include "CMB/ACT_south.hh"
#include "Parser.hh"
#include "paramfile.h"
#include <iostream>
......@@ -8,17 +8,17 @@
using namespace std;
ACTSouthChi2::ACTSouthChi2(const std::string parfile):HighEllChi2(parfile){
ACTSouth::ACTSouth(const std::string parfile):HighEll(parfile){
paramfile parameters(_parfile);
cout << "ACTSouthChi2 Likelihood for ACT - southern fields " << endl;
cout << "ACTSouthChi2 param file "<< _parfile<<endl;
cout << "ACTSouth Likelihood for ACT - southern fields " << endl;
cout << "ACTSouth param file "<< _parfile<<endl;
DefNuisanceNames(_parfile) ;
init_types();
read_window_functions();
if (_verbose>2) cout << "ACTSouthChi2 before read spectra "<<endl;
if (_verbose>2) cout << "ACTSouth before read spectra "<<endl;
read_spectra_data();
if (_verbose>2) cout << "ACTSouthChi2 after read spectra size = "<<_size<<endl;
if (_verbose>2) cout << "ACTSouth after read spectra size = "<<_size<<endl;
_cov_matrix = new HepSymMatrix(_size);
cout << " cov matx name "<< _covName<<endl;
......@@ -94,11 +94,11 @@ ACTSouthChi2::ACTSouthChi2(const std::string parfile):HighEllChi2(parfile){
}
ACTSouthChi2::~ACTSouthChi2(){
ACTSouth::~ACTSouth(){
delete _cov_matrix;
}
int ACTSouthChi2::getType(string freqa, string freqb) {
int ACTSouth::getType(string freqa, string freqb) {
int typ=0;
for (int k=0 ; k< _nfreqs ; k++)
......@@ -110,7 +110,7 @@ int ACTSouthChi2::getType(string freqa, string freqb) {
}
void ACTSouthChi2::init_types(){
void ACTSouth::init_types(){
_ntyp = 0;
for (int k=0 ; k< _nfreqs ; k++){
for (int kk=k ; kk< _nfreqs ; kk++,_ntyp++){
......@@ -131,7 +131,7 @@ void ACTSouthChi2::init_types(){
}
// specific nuisance names
void ACTSouthChi2::DefNuisanceNames( string parfile )
void ACTSouth::DefNuisanceNames( string parfile )
{
char buff[64];
cout << " ACT south - define nuisance existing "<< _n.size() <<" params "<<endl;
......@@ -155,9 +155,9 @@ void ACTSouthChi2::DefNuisanceNames( string parfile )
}
void ACTSouthChi2::getCovMat(string name){
void ACTSouth::getCovMat(string name){
ifstream file(name.c_str(),ios::in);
if (_verbose>2) cout << " ACTSouthChi2::getCovMat size "<< _size<<endl;
if (_verbose>2) cout << " ACTSouth::getCovMat size "<< _size<<endl;
double a ;
for (int kk=0 ; kk< _size ; kk++)
for (int k=0 ; k< _size ; k++){
......@@ -168,7 +168,7 @@ void ACTSouthChi2::getCovMat(string name){
}
}
string ACTSouthChi2::get_blname(string freqa, string freqb, string parta, string partb){
string ACTSouth::get_blname(string freqa, string freqb, string parta, string partb){
string sname ;
// BblMean_150x150_new.dat
//
......@@ -187,7 +187,7 @@ string ACTSouthChi2::get_blname(string freqa, string freqb, string parta, strin
return(sname);
}
string ACTSouthChi2::get_spname(string freqa, string freqb, string parta, string partb){
string ACTSouth::get_spname(string freqa, string freqb, string parta, string partb){
string name ;
//spt_bandpower_150x150.dat
name = "/spectrum_";
......@@ -206,26 +206,26 @@ string ACTSouthChi2::get_spname(string freqa, string freqb, string parta, string
}
void ACTSouthChi2::buildDustTemplates(int lmin, int lmax){
void ACTSouth::buildDustTemplates(int lmin, int lmax){
vector <double> spdust;
cout << " ACTSouthChi2::buildDustTemplates lmin "<< lmin<<" " << lmax << endl;
cout << " ACTSouth::buildDustTemplates lmin "<< lmin<<" " << lmax << endl;
for (int l=lmin ; l<lmax ; l++){
spdust.push_back( pow(((double)l)/3000.,-0.7) );
}
if (_verbose>2) cout << "ACTSouthChi2::buildDustTemplates "<< spdust.size() << " " << lmin<<" " << lmax << " " << _ntyp << endl;
if (_verbose>2) cout << "ACTSouth::buildDustTemplates "<< spdust.size() << " " << lmin<<" " << lmax << " " << _ntyp << endl;
for (int k=0 ; k<_ntyp ; k++) {
_templ_dust.push_back( spdust );
}
if (_verbose>2) cout << "ACTSouthChi2::buildDustTemplates "<< _templ_dust.size() << endl;
if (_verbose>2) cout << "ACTSouth::buildDustTemplates "<< _templ_dust.size() << endl;
}
vector < vector <double> > ACTSouthChi2::getDust( ){// std::vector<double>& nuisance ) {
vector < vector <double> > ACTSouth::getDust( ){// std::vector<double>& nuisance ) {
vector < vector <double> > temp ( _templ_dust ); // constructeur par copie ?
if (_verbose>2) cout << " ACTSouthChi2 getdust "<< temp.size() << endl;
if (_verbose>2) cout << " ACTSouth getdust "<< temp.size() << endl;
int ityp=0;
double fta,ftb;
for (int k=0 ; k< _nfreqs ; k++) {
......@@ -243,7 +243,7 @@ vector < vector <double> > ACTSouthChi2::getDust( ){// std::vector<double>& nui
return (temp);
}
void ACTSouthChi2::HandleNuisance( std::vector<double>& nuisance){
void ACTSouth::HandleNuisance( std::vector<double>& nuisance){
if (_verbose>2)
cout << " ACT south handle nuisance "<< nuisance.size()<<" " << _types.size()<<" " << 2+_nfreqs + _nfreqs*(_nfreqs-1) <<endl;
if (_verbose>2)
......
#ifndef ACTSouthChi2_hh
#define ACTSouthChi2_hh
#ifndef ACTSouth_hh
#define ACTSouth_hh
#include "CLHEP/Matrix/Vector.h"
#include "CLHEP/Matrix/Matrix.h"
#include "CLHEP/Matrix/SymMatrix.h"
#include "CMB/HighEllChi2.hh"
#include "CMB/HighEll.hh"
......@@ -18,11 +18,11 @@
using namespace std;
class ACTSouthChi2 : public HighEllChi2
class ACTSouth : public HighEll
{
public:
ACTSouthChi2(const std::string parfile);
~ACTSouthChi2();
ACTSouth(const std::string parfile);
~ACTSouth();
void DefNuisanceNames( std::string parfile );
void getCovMat(std::string name);
......
#include "HighEllChi2.hh"
#include "HighEll.hh"
#include "Parser.hh"
#include "paramfile.h"
......@@ -13,7 +13,7 @@ using namespace std;
#define h_pl 6.626068e-34
HighEllChi2::HighEllChi2(const string parfile )
HighEll::HighEll(const string parfile )
{
_plik_mode = false;
read_par_file( parfile );
......@@ -36,11 +36,11 @@ HighEllChi2::HighEllChi2(const string parfile )
}
HighEllChi2::~HighEllChi2(){
HighEll::~HighEll(){
}
void HighEllChi2:: read_par_file(const string filename )
void HighEll:: read_par_file(const string filename )
{
paramfile parameters(filename);
_parfile = filename ;
......@@ -94,7 +94,7 @@ void HighEllChi2:: read_par_file(const string filename )
if (parameters.param_present("plik_mode")) _plik_mode =true;
}
void HighEllChi2::read_window_functions(){
void HighEll::read_window_functions(){
cout << " reading window functions for "<<_nfreqs<< " frequencies"<< endl;
int ibwfun = 0 ;
......@@ -166,7 +166,7 @@ void HighEllChi2::read_window_functions(){
cout << " read "<< _winFct.size() <<" window fcts "<< endl;
}
void HighEllChi2::read_spectra_data()
void HighEll::read_spectra_data()
{
cout << " read high ell spectra for "<<_name<<endl;
// lectures des spectres
......@@ -244,7 +244,7 @@ void HighEllChi2::read_spectra_data()
cout <<" read "<< _nSpectra << " spectra" <<endl;
}
void HighEllChi2::computeResiduals(const vector<unsigned int>& l,vector<double>& cltt,vector<double>& clte,vector<double>& clee,vector<double>& clbb,vector<double>& nuisance){
void HighEll::computeResiduals(const vector<unsigned int>& l,vector<double>& cltt,vector<double>& clte,vector<double>& clee,vector<double>& clbb,vector<double>& nuisance){
ofstream * fileout ;
......@@ -480,7 +480,7 @@ void HighEllChi2::computeResiduals(const vector<unsigned int>& l,vector<double>&
}
double HighEllChi2::computeLikelihood(const vector<unsigned int>& l,vector<double>& cltt,vector<double>& clte,vector<double>& clee,vector<double>& clbb,vector<double>& nuisance)
double HighEll::computeLikelihood(const vector<unsigned int>& l,vector<double>& cltt,vector<double>& clte,vector<double>& clee,vector<double>& clbb,vector<double>& nuisance)
{
double mychi2 = 0.;
if (_verbose >2) cout << " high ell likelihood compute for"<< _name<<" nuisance size "<< nuisance.size()<<endl;
......@@ -574,7 +574,7 @@ double HighEllChi2::computeLikelihood(const vector<unsigned int>& l,vector<doubl
}
double HighEllChi2::sz_func(double freq){
double HighEll::sz_func(double freq){
double sz_corr = 0 ;
double nu=freq*1.e9;
......@@ -584,7 +584,7 @@ double HighEllChi2::sz_func(double freq){
return(sz_corr*t_cmb);
}
double HighEllChi2::planck_func_ratio(double freq,double fref,double t_eff){
double HighEll::planck_func_ratio(double freq,double fref,double t_eff){
double corr =0.;
double nu=freq*1.e9;
double nu0=fref*1.e9;
......@@ -596,7 +596,7 @@ double HighEllChi2::planck_func_ratio(double freq,double fref,double t_eff){
}
double HighEllChi2::flxtotemp(double fa,double fref){
double HighEll::flxtotemp(double fa,double fref){
double corr = 0.;
double nu=fa*1.e9;
double nu0=fref*1.e9;
......@@ -609,7 +609,7 @@ double HighEllChi2::flxtotemp(double fa,double fref){
}
void HighEllChi2::readAllCIBTemplates(int lmin, int lmax) {
void HighEll::readAllCIBTemplates(int lmin, int lmax) {
cout << " reading CIB templates in "<< _CIB_file<<" between lmin= "<< lmin<<" and lmax= "<<lmax<<endl;
double a , b1 , b2 , b3 , b4 , b5 , b6,b7,b8,b9, b10, b11 , b12 , b13 , b14 , b15 , b16,b17,b18,b19,b20,b21;
//std::string lineData;
......@@ -653,7 +653,7 @@ void HighEllChi2::readAllCIBTemplates(int lmin, int lmax) {
}
void HighEllChi2::readAlltSZxCIBTemplates(int lmin, int lmax) {
void HighEll::readAlltSZxCIBTemplates(int lmin, int lmax) {
cout << " reading All tSZxCIB templates in "<< _tSZxCIB_file<<" between lmin= "<< lmin<<" and lmax= "<<lmax<<endl;
double a , b1 , b2 , b3 , b4 , b5 , b6,b7,b8,b9, b10, b11 , b12 , b13 , b14 , b15 , b16,b17,b18,b19,b20,b21;
//std::string lineData;
......@@ -712,7 +712,7 @@ void HighEllChi2::readAlltSZxCIBTemplates(int lmin, int lmax) {
}
void HighEllChi2::readtSZxCIBTemplate(int lmin, int lmax) {
void HighEll::readtSZxCIBTemplate(int lmin, int lmax) {
cout << " reading tSZxCIB template in "<< _tSZxCIB_file<<" between lmin= "<< lmin<<" and lmax= "<<lmax<<endl;
vector <double> vbuf;
// reference SZ = 143 GHz
......@@ -767,7 +767,7 @@ void HighEllChi2::readtSZxCIBTemplate(int lmin, int lmax) {
//======================================================================== new version
void HighEllChi2::readCIBTemplates(int lmin, int lmax) {
void HighEll::readCIBTemplates(int lmin, int lmax) {
cout << " reading CIB templates in "<< _CIB_file<<" lmin "<< lmin<<" lmax "<<lmax<<endl;
vector <double> vbuf;
......@@ -811,7 +811,7 @@ void HighEllChi2::readCIBTemplates(int lmin, int lmax) {
//========================================================================
vector < vector <double> > HighEllChi2::getCIB(){// std::vector<double>& nuisance ){
vector < vector <double> > HighEll::getCIB(){// std::vector<double>& nuisance ){
if (_verbose >2) cout << " getCIB for "<<_name<<endl;
vector < vector <double> > temp ( _templ_CIB ); // constructeur par copie ?
......@@ -834,7 +834,7 @@ return(temp);
//========================================================================
vector < vector <double> > HighEllChi2::gettSZxCIB(){// std::vector<double>& nuisance ){
vector < vector <double> > HighEll::gettSZxCIB(){// std::vector<double>& nuisance ){
if (_verbose >2) cout << " gettSZxCIB for "<<_name<< " ampli "<<_AtSZxCIB <<endl;
vector < vector <double> > temp ( _templ_tSZxCIB ); // constructeur par copie ?
double fact = _AtSZxCIB ;
......@@ -861,7 +861,7 @@ return(temp);
void HighEllChi2::readtSZTemplates(int lmin, int lmax) {
void HighEll::readtSZTemplates(int lmin, int lmax) {
cout << " reading tSZ template in "<< _tSZ_file <<" lmin "<< lmin<<" lmax "<<lmax<<endl;
vector <double> vbuf;
// reference = 143 GHz
......@@ -906,7 +906,7 @@ void HighEllChi2::readtSZTemplates(int lmin, int lmax) {
cout << " tSZ templates read "<<endl;
}
void HighEllChi2::readkSZTemplates(int lmin, int lmax) {
void HighEll::readkSZTemplates(int lmin, int lmax) {
cout << " reading kSZ template in "<< _kSZ_file <<" lmin "<< lmin<<" lmax "<<lmax<<endl;
vector <double> vbuf;
......@@ -948,7 +948,7 @@ void HighEllChi2::readkSZTemplates(int lmin, int lmax) {
cout << " kSZ templates read ! " <<endl;
}
vector < vector <double> > HighEllChi2::gettSZ(){// std::vector<double>& nuisance ){
vector < vector <double> > HighEll::gettSZ(){// std::vector<double>& nuisance ){
vector < vector <double> > temp ( _templ_tSZ ); // constructeur par copie ?
......@@ -965,7 +965,7 @@ vector < vector <double> > HighEllChi2::gettSZ(){// std::vector<double>& nuisan
return(temp);
}
vector < vector <double> > HighEllChi2::getkSZ(){// std::vector<double>& nuisance ){
vector < vector <double> > HighEll::getkSZ(){// std::vector<double>& nuisance ){
vector < vector <double> > temp ( _templ_kSZ ); // constructeur par copie ?
......
#ifndef HighEllChi2_hh
#define HighEllChi2_hh
#ifndef HighEll_hh
#define HighEll_hh
#include "CLHEP/Matrix/Vector.h"
#include "CLHEP/Matrix/Matrix.h"
......@@ -20,13 +20,13 @@ using namespace std;
//
//
class HighEllChi2 : public ClLikelihood
class HighEll : public ClLikelihood
{
public:
HighEllChi2(const std::string parfile);
HighEll(const std::string parfile);
virtual ~HighEllChi2();
virtual ~HighEll();
void readWinFunc(const std::string parfile);
void read_par_file(const std::string filename);
......@@ -68,7 +68,7 @@ public:
std::vector<double>& clee,
std::vector<double>& clbb) {
std::vector<double> nuisance;
return HighEllChi2::computeLikelihood(l,cltt,clte,clee,clbb,nuisance);
return HighEll::computeLikelihood(l,cltt,clte,clee,clbb,nuisance);
}
void computeResiduals(const vector<unsigned int>& l,
......
#include "CMB/SPT_high_chi2.hh"
#include "CMB/SPT_high.hh"
#include "Parser.hh"
#include "paramfile.h"
#include <iostream>
......@@ -7,7 +7,7 @@
#include <cstring>
SPTHighChi2::SPTHighChi2(const std::string parfile):HighEllChi2(parfile){
SPTHigh::SPTHigh(const std::string parfile):HighEll(parfile){
cout << " Likelihood high ell for SPT " << endl;
cout << " param file "<< _parfile<<endl;
......@@ -110,12 +110,12 @@ SPTHighChi2::SPTHighChi2(const std::string parfile):HighEllChi2(parfile){
}
SPTHighChi2::~SPTHighChi2(){
SPTHigh::~SPTHigh(){
delete _cov_matrix;
}
void SPTHighChi2::init_types(){
void SPTHigh::init_types(){
_ntyp = 0;
for (int k=0 ; k< _nfreqs ; k++){
......@@ -136,7 +136,7 @@ void SPTHighChi2::init_types(){
}
}
int SPTHighChi2::getType(string freqa, string freqb) {
int SPTHigh::getType(string freqa, string freqb) {
int typ=0;
for (int k=0 ; k< _nfreqs ; k++)
......@@ -150,7 +150,7 @@ int SPTHighChi2::getType(string freqa, string freqb) {
// specific nuisance names
void SPTHighChi2::DefNuisanceNames( string parfile )
void SPTHigh::DefNuisanceNames( string parfile )
{
char buff[64];
cout << " SPT high - nuisance existing "<< _n.size() <<" params "<<endl;
......@@ -172,9 +172,9 @@ void SPTHighChi2::DefNuisanceNames( string parfile )
}
void SPTHighChi2::getCovMat(string name){
void SPTHigh::getCovMat(string name){
ifstream file(name.c_str(),ios::in);
cout << "SPTHighChi2::getCovMat starts "<<endl;
cout << "SPTHigh::getCovMat starts "<<endl;
double a ;
for (int kk=0 ; kk< _size ; kk++)
for (int k=0 ; k< _size ; k++){
......@@ -191,11 +191,11 @@ void SPTHighChi2::getCovMat(string name){
}
if ( _need_covmat_inversion!=0 ) {
cout << "SPTHighChi2::getCovMat => inversion "<<endl;
cout << "SPTHigh::getCovMat => inversion "<<endl;
int ifail =0;
_cov_matrix->invert(ifail);
if (ifail !=0) {
cout << "SPTHighChi2 cov matrix inversion fails - exit "<<ifail<<endl;
cout << "SPTHigh cov matrix inversion fails - exit "<<ifail<<endl;
exit(-99);
}
for (int kk=0 ; kk< 5 ; kk++){
......@@ -212,7 +212,7 @@ void SPTHighChi2::getCovMat(string name){
}
}
string SPTHighChi2::get_blname(string freqa, string freqb, string parta, string partb){
string SPTHigh::get_blname(string freqa, string freqb, string parta, string partb){
string sname ;
// BblMean_150x150_new.dat
//
......@@ -226,7 +226,7 @@ string SPTHighChi2::get_blname(string freqa, string freqb, string parta, string
return(sname);
}
string SPTHighChi2::get_spname(string freqa, string freqb, string parta, string partb){
string SPTHigh::get_spname(string freqa, string freqb, string parta, string partb){
string name ;
//spt_bandpower_150x150.dat
name = "/spt_bandpower_";
......@@ -241,20 +241,20 @@ string SPTHighChi2::get_spname(string freqa, string freqb, string parta, string
}
void SPTHighChi2::buildDustTemplates(int lmin, int lmax){
void SPTHigh::buildDustTemplates(int lmin, int lmax){
vector <double> spdust;