Changeset 3378 in Sophya for trunk/Cosmo/SimLSS/cmvfitpk.cc

Timestamp:

Nov 9, 2007, 7:04:12 PM (18 years ago)

Author:

cmv

Message:

modif sur remplissage NTuple/Minos, possibilite de changer les parametres O0,Om,Ol etc... , cmv 09/11/2007

File:

• trunk/Cosmo/SimLSS/cmvfitpk.cc (modified) (6 diffs)

trunk/Cosmo/SimLSS/cmvfitpk.cc

@@ -124 +124 @@
  // --- NTuple et ppf
  POutPersist pos("cmvfitpk.ppf");
- const int nvar = 10;
- char *vname[nvar] = {"xi2","a","b","ea","eb","eab","ea1","ea2","eb1","eb2"};
+ const int nvar = 6;
+ char *vname[nvar] = {"xi2","a","b","ea","eb","eab"};
  NTuple nt(nvar,vname);
  double xnt[nvar];
@@ -156 +156 @@
    // --- Initialisation de minuit
     MnUserParameters upar;
+    const int npar = 2;
     upar.Add("A",1.,0.01);
     upar.Add("B",b_ini,b_ini/100.);
@@ -176 +177 @@
    MnUserParameterState ustate = min.UserState();
 
-   MnMinos Minos(fcn,min);
-   pair<double,double> eminos[2];
-   for(int ip=0;ip<2;ip++) {
-     eminos[ip].first = eminos[ip].second = 0.;
-     if(!ustate.Parameter(ip).IsFixed()) eminos[ip] = Minos(ip);
-   }
-
    // --- Recuperation des informations et remplissage NTuple
    for(int i=0;i<nvar;i++) xnt[i] = 0.;
    double xi2r = ustate.Fval()/(nbinok-upar.VariableParameters());
+   double A = ustate.Value((unsigned int)0);
+   double B = ustate.Value((unsigned int)1);
    xnt[0] = xi2r;
-   xnt[1] = ustate.Value((unsigned int)0);
-   xnt[2] = ustate.Value((unsigned int)1);
+   xnt[1] = A;
+   xnt[2] = B;
    xnt[3] = ustate.Error((unsigned int)0);
    xnt[4] = ustate.Error((unsigned int)1);
    if(ustate.HasCovariance()) xnt[5] = ustate.Covariance()(0,1);
-   xnt[6] = eminos[0].first;
-   xnt[7] = eminos[0].second;
-   xnt[8] = eminos[1].first;
-   xnt[9] = eminos[1].second;
    nt.Fill(xnt);
 
@@ -202 +194 @@
      HistoErr herrf(herr); herrf.Zero();
      HistoErr herrd(herr); herrd.Zero();
-     for(int i=0;i<herr.NBins();i++) {
-       double f = pkz(herr.BinCenter(i));
+     for(int i=1;i<herr.NBins();i++) {
+       double f = A*pkz(herr.BinCenter(i))+B;
        herrf.SetBin(i,f,herr.Error(i),1.);
        herrd.SetBin(i,herr(i)-f,herr.Error(i),1.);
@@ -214 +206 @@
 
    // --- Print de debug
-   if(nfile==0) {
+   if(nfile<3) {
      cout<<"minimum: "<<min<<endl;
      for(int i=0;i<nvar;i++) cout<<"["<<i<<"] = "<<xnt[i]<<endl;
+
+     MnMinos Minos(fcn,min);
+     pair<double,double> eminos[npar];
+     for(int ip=0;ip<npar;ip++) {
+       eminos[ip].first = eminos[ip].second = 0.;
+       if(!ustate.Parameter(ip).IsFixed()) eminos[ip] = Minos(ip);
+       cout<<"Minos: "<<ip<<" err=["<<eminos[ip].first<<","<<eminos[ip].second<<"]"<<endl;
+     }
    }
 
@@ -248 +248 @@
 }
 
+/*
+openppf cmvfitpk.ppf
+
+set i 0
+zone
+disp h$i "nsta hbincont err"
+disp hf$i "nsta same red"
+
+zone
+disp hd$i "nsta hbincont err red"
+disp hd$i "nsta same"
+
+zone
+n/plot nt.xi2
+
+zone
+n/plot nt.a
+n/plot nt.b
+n/plot nt.b%a ! ! "crossmarker5"
+
+n/plot nt.ea
+n/plot nt.eb
+n/plot nt.ea%eb ! ! "crossmarker5"
+
+ */