Changeset 3572 in Sophya for trunk/Cosmo

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

Location:

trunk/Cosmo

Files:

• RadioBeam/brsrc.cc (modified) (1 diff)
• RadioBeam/multicyl.cc (modified) (1 diff)
• RadioBeam/multicyl.h (modified) (1 diff)
• RadioBeam/treccyl.cc (modified) (2 diffs)
• SimLSS/cmvchkwhu.cc (modified) (1 diff)
• SimLSS/cmvfitpk.cc (modified) (1 diff)
• SimLSS/cmvsinxsx.cc (modified) (1 diff)
• SimLSS/cmvtgrowth.cc (modified) (1 diff)
• SimLSS/cmvtluc.cc (modified) (1 diff)
• SimLSS/cmvtransf.cc (modified) (1 diff)
• SimLSS/cmvtstagn.cc (modified) (1 diff)
• SimLSS/cmvtstblack.cc (modified) (1 diff)
• SimLSS/cmvtstpk.cc (modified) (1 diff)
• SimLSS/cmvtstsch.cc (modified) (1 diff)
• SimLSS/cmvtuniv.cc (modified) (2 diffs)
• SimLSS/cmvtvarspec.cc (modified) (1 diff)
• SimLSS/genefluct3d.cc (modified) (7 diffs)

trunk/Cosmo/RadioBeam/brsrc.cc

@@ -118 +118 @@
 NTuple BRSourceGen::Convert2Table(double freq0)
 {
-  char* nomsntsrc[9] = {"num","freq","freqred","amp","angrad","angdeg","phase",
-                        "angyrad","angymin"};
+  const char* nomsntsrc[9] = {"num","freq","freqred","amp","angrad","angdeg","phase",
+                              "angyrad","angymin"};
   NTuple nt(9, nomsntsrc);
   double xnt[15];

trunk/Cosmo/RadioBeam/multicyl.cc

@@ -33 +33 @@
 
 //-----------------------------------------------------------------------------
-MultiCylinders::MultiCylinders(char* fileName)
+MultiCylinders::MultiCylinders(const char* fileName)
 {
   adfg_ = false; src_ = NULL;

trunk/Cosmo/RadioBeam/multicyl.h

@@ -28 +28 @@
   //   longueur @ f=2 ~ 64 (256*lambda/2 = 256*0.25)
  MultiCylinders(int nr=256, int ns=1024);
- MultiCylinders(char* filename);
+ MultiCylinders(const char* filename);
  ~MultiCylinders();
 

trunk/Cosmo/RadioBeam/treccyl.cc

@@ -36 +36 @@
 static int test1cyl(string& ppfname);
 static int testmulticyl(string& ppfname);
-int ReadParam(char* fileName);
+int ReadParam(const char* fileName);
 
 //-----------------------------------------------------------
@@ -285 +285 @@
 
 //---------------------------------------------------------------------
-int ReadParam(char* fileName)
+int ReadParam(const char* fileName)
 {  
   DataCards dc;

trunk/Cosmo/SimLSS/cmvchkwhu.cc

@@ -48 +48 @@
 
  const int n = 11;
- char *vname[n] = {"k","tf","tfnw","tfnb","tfc","tfb"
+ const char *vname[n] = {"k","tf","tfnw","tfnb","tfc","tfb"
                   ,"hutf","hutfnw","hutfnb","hutfc","hutfb"};
  NTuple nt(n,vname);

trunk/Cosmo/SimLSS/cmvfitpk.cc

@@ -133 +133 @@
  POutPersist pos("cmvfitpk.ppf");
  const int nvar = 2*npar+1;
- char *vname[nvar] = {
+ const char *vname[nvar] = {
        "xi2"
        ,"b","a","oc","ob","ol","h","n"

trunk/Cosmo/SimLSS/cmvsinxsx.cc

@@ -75 +75 @@
  //--- Create NTuple
  const int nvar = 11;
- char *vname[nvar] = {"t","s","sn","sx","sx2","snx","snx2","asx","asx2","asnx","asnx2"};
+ const char *vname[nvar] = {"t","s","sn","sx","sx2","snx","snx2","asx","asx2","asnx","asnx2"};
  double xnt[nvar];
  NTuple nt(nvar,vname);

trunk/Cosmo/SimLSS/cmvtgrowth.cc

@@ -35 +35 @@
 
  const int n = 2;
- char *vname[n] = {"z","d1"};
+ const char *vname[n] = {"z","d1"};
  NTuple nt(n,vname);
  double xnt[n];

trunk/Cosmo/SimLSS/cmvtluc.cc

@@ -56 +56 @@
  double norm3 = pow(norm,3.);
  const int n = 11;
- char *vname[n] = {
+ const char *vname[n] = {
    "z","hz","om","or","ol","ok","ot",
    "da","dl","dvc","vc0"

trunk/Cosmo/SimLSS/cmvtransf.cc

@@ -79 +79 @@
 
  const int n = 6;
- char *vname[n] = {"k","t","tnosc1","tnosc2","tnob","tcmbf"};
+ const char *vname[n] = {"k","t","tnosc1","tnosc2","tnob","tcmbf"};
  NTuple nt(n,vname);
  double xnt[n];

trunk/Cosmo/SimLSS/cmvtstagn.cc

@@ -158 +158 @@
 
 del ntjack
-c++exec char *vname[2] = {"x","y"}; double xnt[2]; \
+c++exec const char *vname[2] = {"x","y"}; double xnt[2]; \
 NTuple ntjack(2,vname); \
 for(int i=0;i<xjack.Size();i++) \

trunk/Cosmo/SimLSS/cmvtstblack.cc

@@ -267 +267 @@
 
  const int n = 14;
- char *vname[n] = {"f","l","prf","prl","pdf","pdl","rrf","rrl","rdf","rdl","wrf","wrl","wdf","wdl"};
+ const char *vname[n] = {"f","l","prf","prl","pdf","pdl","rrf","rrl","rdf","rdl","wrf","wrl","wdf","wdl"};
  NTuple nt(n,vname);
  double xnt[n];

trunk/Cosmo/SimLSS/cmvtstpk.cc

@@ -119 +119 @@
  //--------------------------
  const int n = 14;
- char *vname[n] = {
+ const char *vname[n] = {
    "k","pkini",
    "tf","pk0","pk",

trunk/Cosmo/SimLSS/cmvtstsch.cc

@@ -169 +169 @@
  //-------
  const int n = 3;
- char *vname[n] = {"m","f","mf"};
+ const char *vname[n] = {"m","f","mf"};
  NTuple nt(n,vname);
  double xnt[n];

trunk/Cosmo/SimLSS/cmvtuniv.cc

@@ -184 +184 @@
  double norm3 = pow(norm,3.);
  const int n = 15;
- char *vname[n] = {
+ const char *vname[n] = {
    "z","hz","om","or","ol","ok","ot","ob",
    "dtc","dlc","da","dl",
@@ -269 +269 @@
 
  const int n = 8;
- char *vname[n] = {"z","d","di","dl","dp","zi","zl","zp"};
+ const char *vname[n] = {"z","d","di","dl","dp","zi","zl","zp"};
  NTuple nt(n,vname);
  double xnt[n];

trunk/Cosmo/SimLSS/cmvtvarspec.cc

@@ -130 +130 @@
 //-----------------------------------------------------------------
  const int n = 2;
- char *vname[n] = {"k","pk"};
+ const char *vname[n] = {"k","pk"};
  NTuple nt(n,vname);
  double xnt[n];

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -106 +106 @@
                 <<" D="<<dx<<","<<dy<<","<<dz<<endl;
  if(nx<=0 || dx<=0.) {
-   char *bla = "GeneFluct3D::setsize_Error: bad value(s) for nn/dx";
+   const char *bla = "GeneFluct3D::setsize_Error: bad value(s) for nn/dx";
    cout<<bla<<endl; throw ParmError(bla);
  }
@@ -228 +228 @@
  if(kredshref<0.) {
    if(Nz_<=0) {
-     char *bla = "GeneFluct3D::SetObservator_Error: for kredsh_ref<0 define cube geometry first";
+     const char *bla = "GeneFluct3D::SetObservator_Error: for kredsh_ref<0 define cube geometry first";
      cout<<bla<<endl; throw ParmError(bla);
    }
@@ -265 +265 @@
 
  if(cosmo_ == NULL || redsh_ref_<0.) {
-   char *bla = "GeneFluct3D::LosComRedshift_Error: set Observator and Cosmology first";
+   const char *bla = "GeneFluct3D::LosComRedshift_Error: set Observator and Cosmology first";
    cout<<bla<<endl; throw ParmError(bla);
  }
@@ -561 +561 @@
   else if(array_type==2) nvar = 4;
   else return;
-  char *vname[4] = {"t","z","re","im"};
+  const char *vname[4] = {"t","z","re","im"};
   float xnt[4];
   NTuple nt(nvar,vname);
@@ -852 +852 @@
 
  if(growth_ == NULL) {
-   char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: set GrowthFactor first";
+   const char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: set GrowthFactor first";
    cout<<bla<<endl; throw ParmError(bla);
  }
  if(type_evol<1 || type_evol>2) {
-   char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: bad type_evol value";
+   const char *bla = "GeneFluct3D::ApplyGrowthFactor_Error: bad type_evol value";
    cout<<bla<<endl; throw ParmError(bla);
  }
 
  InterpFunc interpinv(loscom2zred_min_,loscom2zred_max_,loscom2zred_);
- unsigned short ok;
+ //unsigned short ok;
 
  //CHECK: Histo hgr(0.9*zred_[0],1.1*zred_[n-1],1000);
@@ -1421 +1421 @@
  if(type_evol<0) type_evol = 0;
  if(type_evol>2) {
-   char *bla = "GeneFluct3D::AddNoise2Real_Error: bad type_evol value";
+   const char *bla = "GeneFluct3D::AddNoise2Real_Error: bad type_evol value";
    cout<<bla<<endl; throw ParmError(bla);
  }
@@ -1436 +1436 @@
    //      Mlim ~ sqrt(DNu) * (Dlum)^2 / Dtrcom
    if(cosmo_ == NULL || redsh_ref_<0.| loscom2zred_.size()<1) {
-     char *bla = "GeneFluct3D::AddNoise2Real_Error: set Observator and Cosmology first";
+     const char *bla = "GeneFluct3D::AddNoise2Real_Error: set Observator and Cosmology first";
      cout<<bla<<endl; throw ParmError(bla);
    }