Changeset 3284 in Sophya for trunk/Cosmo/SimLSS

Timestamp:

Jul 27, 2007, 12:03:29 PM (18 years ago)

Author:

cmv

Message:

Creation de cmvschdist.cc cmv 27/07/2007

Location:

trunk/Cosmo/SimLSS

Files:

• Makefile (modified) (3 diffs)
• cmvconcherr.cc (modified) (2 diffs)
• cmvschdist.cc (added)
• cmvtstsch.cc (modified) (2 diffs)
• genefluct3d.cc (modified) (1 diff)

trunk/Cosmo/SimLSS/Makefile

@@ -20 +20 @@
        $(EXE)cmvdefsurv $(EXE)cmvobserv3d $(EXE)cmvtintfun \
        $(EXE)cmvtpoisson $(EXE)cmvconcherr $(EXE)cmvtinterp \
-       $(EXE)cmvtstagn
+       $(EXE)cmvtstagn $(EXE)cmvschdist
 #$(EXE)cmvtluc
  
@@ -28 +28 @@
           $(OBJ)cmvobserv3d.o $(OBJ)cmvtintfun.o $(OBJ)cmvtinterp.o \
           $(OBJ)cmvtpoisson.o $(OBJ)cmvconcherr.o $(OBJ)cmvtluc.o \
-          $(OBJ)cmvtstagn.o
+          $(OBJ)cmvtstagn.o $(OBJ)cmvschdist.o
  
 LIBROBJ = \
@@ -183 +183 @@
 
 ##############################################################################
+cmvschdist: $(EXE)cmvschdist
+        echo $@ " done"
+$(EXE)cmvschdist: $(OBJ)cmvschdist.o $(LIB)libcmvsimbao.a
+        $(CXXLINK) $(CXXREP) -o $@ $(OBJ)cmvschdist.o $(MYLIB) 
+$(OBJ)cmvschdist.o: cmvschdist.cc
+        $(CXXCOMPILE) $(CXXREP) -I$(MYEXTINC) -o $@ cmvschdist.cc
+
+
+
+##############################################################################
 cmvtluc: $(EXE)cmvtluc
         echo $@ " done"

trunk/Cosmo/SimLSS/cmvconcherr.cc

@@ -314 +314 @@
 zone
 n/plot herrconc.val%log10(x) x>0 ! "connectpoints"
+n/plot herrconc.val-sqrt(err2)%log10(x) x>0&&err2>0 ! "connectpoints same red"
+n/plot herrconc.val+sqrt(err2)%log10(x) x>0&&err2>0 ! "connectpoints same red"
+
 n/plot herrconc.sqrt(err2)%log10(x) x>0&&err2>0 ! "connectpoints same red"
-
 n/plot herrconc.sqrt(err2)/val%log10(x) x>0&&err2>0&&val>0 ! "connectpoints"
 
@@ -334 +336 @@
 
 imag cor
+n/plot cor.val%c r==500 ! "connectpoints"
 
 ####

trunk/Cosmo/SimLSS/cmvtstsch.cc

@@ -91 +91 @@
  cout<<"sch(mstar) = "<<sch(mstar)<<" /Mpc^3/Msol"<<endl;
  sch.SetOutValue(0);
- for(double lnx=lnx1-5.;lnx<=lnx2-1.;lnx+=1.) {
+ cout<<"......"<<endl;
+ for(double lnx=lnx1-3.;lnx<=lnx2-1.;lnx+=1.) {
    double num = IntegrateFuncLog(sch,lnx,lnx2,perc,dlxinc,dlxmax,glorder);
    cout<<"["<<lnx<<","<<lnx2<<"] integrated number = "<<num<<" Mpc^-3"<<endl;
+ }
+ cout<<"......"<<endl;
+ for(double lnx=lnx1+1.;lnx<=lnx2+3.;lnx+=1.) {
+   double num = IntegrateFuncLog(sch,lnx1,lnx,perc,dlxinc,dlxmax,glorder);
+   cout<<"["<<lnx1<<","<<lnx<<"] integrated number = "<<num<<" Mpc^-3"<<endl;
+ }
+ cout<<"......"<<endl;
+ for(double lnx=lnx1-3.;lnx<=lnx2+3.;lnx+=1.) {
+   double num = IntegrateFuncLog(sch,lnx,lnx+1.,perc,dlxinc,dlxmax,glorder);
+   cout<<"["<<lnx<<","<<lnx+1.<<"] integrated number = "<<num<<" Mpc^-3"<<endl;
  }
  Histo hdndm(lnx1,lnx2,npt); hdndm.ReCenterBin();
@@ -102 +113 @@
  sch.SetOutValue(1);
  cout<<"mstar*sch(mstar) = "<<sch(mstar)<<" Msol/Mpc^3/Msol"<<endl;
- for(double lnx=lnx1-5.;lnx<=lnx2-1.;lnx+=1.) {
+ cout<<"......"<<endl;
+ for(double lnx=lnx1-3.;lnx<=lnx2-1.;lnx+=1.) {
    double sum = IntegrateFuncLog(sch,lnx,lnx2,perc,dlxinc,dlxmax,glorder);
    cout<<"["<<lnx<<","<<lnx2<<"] integrated mass = "<<sum<<" Msol.Mpc^-3"<<endl;
+ }
+ cout<<"......"<<endl;
+ for(double lnx=lnx1+1.;lnx<=lnx2+3.;lnx+=1.) {
+   double sum = IntegrateFuncLog(sch,lnx1,lnx,perc,dlxinc,dlxmax,glorder);
+   cout<<"["<<lnx1<<","<<lnx<<"] integrated mass = "<<sum<<" Msol.Mpc^-3"<<endl;
+ }
+ cout<<"......"<<endl;
+ for(double lnx=lnx1-3.;lnx<=lnx2+3.;lnx+=1.) {
+   double sum = IntegrateFuncLog(sch,lnx,lnx+1.,perc,dlxinc,dlxmax,glorder);
+   cout<<"["<<lnx<<","<<lnx+1.<<"] integrated mass = "<<sum<<" Msol.Mpc^-3"<<endl;
  }
  Histo hmdndm(lnx1,lnx2,npt); hmdndm.ReCenterBin();

trunk/Cosmo/SimLSS/genefluct3d.cc

@@ -1001 +1001 @@
 // Replace  "V"  by  "scalecube * ( V + offsetcube )"
 {
- if(lp_>0) cout<<"--- ScaleCube "<<scalecube<<endl;
+ if(lp_>0) cout<<"--- ScaleCube scale="<<scalecube<<" offset="<<offsetcube<<endl;
 
  for(long i=0;i<Nx_;i++) for(long j=0;j<Ny_;j++) for(long l=0;l<Nz_;l++) {