Changeset 2329 in Sophya


Ignore:
Timestamp:
Feb 24, 2003, 3:14:51 PM (23 years ago)
Author:
cecile
Message:

* empty log message *

Location:
trunk/ArchTOIPipe
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ArchTOIPipe/Kernel/fitsringwtr.cc

    r2320 r2329  
    44//                               Christophe Magneville
    55//                               Reza Ansari
    6 // $Id: fitsringwtr.cc,v 1.2 2003-02-11 14:26:40 cecile Exp $
     6// $Id: fitsringwtr.cc,v 1.3 2003-02-24 14:14:51 cecile Exp $
    77
    88#include "fitsringwtr.h"
    … …  
    7070    strcpy(buf, "RINGDATA");
    7171    fits_write_key(fptr, TSTRING, "PDMTYPE",  &buf, "Planck Data Model Type", &fstatus);
    72     double theta = getData(0, ring);//*nSamples);
     72    double theta = getData(0, ring*nSamples);
    7373    fits_write_key(fptr, TDOUBLE, "CIRTHETA", &theta, "Theta angle in radians", &fstatus);
    74     double phi = getData(1, ring);//*nSamples);
    75     wontNeedBefore(ring);//*nSamples);
     74    double phi = getData(1, ring*nSamples);
     75    wontNeedBefore(ring*nSamples);
    7676    fits_write_key(fptr, TDOUBLE, "CIRPHI", &phi, "Phi angle in radians", &fstatus);
    7777    fits_write_key(fptr, TDOUBLE, "CIRAPER", &aperture, "Aperture angle in radians", &fstatus);
    … …  
    8181    for (int i=0; i<nSamples; i++) {
    8282      double data = getData(2, ring*nSamples+i);
    83       wontNeedBefore(ring*nSamples+i);
    8483      fits_lock();
    8584      fits_write_col(fptr, TDOUBLE, 1,i,1,1, &data, &fstatus);

  • trunk/ArchTOIPipe/Kernel/toimanager.cc

    r2220 r2329  
    33//                               Christophe Magneville
    44//                               Reza Ansari
    5 // $Id: toimanager.cc,v 1.19 2002-10-23 21:05:18 aubourg Exp $
     5// $Id: toimanager.cc,v 1.20 2003-02-24 14:14:51 cecile Exp $
    66
    77#include "toimanager.h"
    … …  
    6060  checkSamplesLimits(2);
    6161  checkSamplesLimits(3);
     62  cout<<"Fin checks"<<endl;
     63 
    6264   
    6365  // debogage affichage des limites apres calcul

  • trunk/ArchTOIPipe/ProcWSophya/toi2ring.cc

    r2319 r2329  
    33//                               Christophe Magneville
    44//                               Reza Ansari
    5 // $Id: toi2ring.cc,v 1.2 2003-01-30 17:19:25 cecile Exp $
     5// $Id: toi2ring.cc,v 1.3 2003-02-24 14:14:51 cecile Exp $
    66
    77#include "toimanager.h"
    … …  
    6868
    6969 
     70 cout << "loop " << snb << " " << sne << endl;
    7071 
    7172for(int k=snb;k<=sne;k++) {
    … …  
    8283  wr[i]++;
    8384
    84   cout << phi << " " << phi_prec << " " << Nrings <<endl;
     85  cout << k << " " << phi << " " << phi_prec << " " << Nrings <<endl;
    8586 
    86   if(phi < phi_prec){
     87  if(phi < phi_prec || k == sne){
    8788   
    88     putData(0,Nrings,ctheta);
    89     putData(1,Nrings,cphi);
    90 
    9189    for(i=0;i<Nsamples;i++) {
    9290      if(wr[i] == 0) r[i] = -999999.;
    93       cout << i << " " << Nrings << " " << Nsamples << " " << ctheta << " " << cphi << " " << r[i]<< endl;
     91      else r[i] /= wr[i];
     92      cout << "PUT " << i << " " << Nrings << " " << Nsamples << " " << ctheta << " " << cphi << " " << r[i]<< endl;
     93      putData(0,Nrings*Nsamples+i,ctheta);
     94      putData(1,Nrings*Nsamples+i,cphi);
    9495      putData(2,Nrings*Nsamples+i,r[i]);
    95       //      putData(1,Nrings*Nsamples+i,wr[i]);
    9696      wr[i]=0;
    9797      r[i]=0.;
    … …  
    9999   
    100100    Nrings++;
     101    return;
     102   
    101103  }
    102104 

  • trunk/ArchTOIPipe/TestPipes/tsttoi2ring.cc

    r2319 r2329  
    2222void usage(void);
    2323void usage(void) {
    24  cout<<"tsttoi2ring fitsin_phase fitsin_value fitsout_value fitsout_weight Nsamples"<<endl;
     24  cout<<"tsttoi2ring fitsin_phase fitsin_value fitsout_value fitsout_weight ";
     25   cout<<" Nsamples SN_begin SN_last (all -f SN_last<SN_begin)"<<endl;
    2526 return;
    2627}
    … …  
    3839bool snimplicit = false;
    3940
    40 if(narg != 6) {usage(); exit(2);}
     41if(narg != 8) {usage(); exit(2);}
    4142char * fitsin_phase    = arg[1];
    4243char * fitsin_value    = arg[2];
    … …  
    4445char * fitsout_weight  = arg[4];
    4546int    Nsamples        = atoi(arg[5]);
     47 int_8 sdeb               = atoi(arg[6]);
     48 int_8 sfin              = atoi(arg[7]);
     49    cout<<"Requested Samples from "<<sdeb<<" , "<<sfin<<endl;
     50 
    4651
    4752cout<<">>>> tsttoi2ring:"<<endl
    … …  
    6772 FITSTOIReader rfitsp(fitsin_phase);
    6873 if(snimplicit) rfitsp.setImplicitSN();
     74 if(sfin>=sdeb) rfitsp.setRequestedSample(sdeb,sfin);
     75
    6976 FITSTOIReader rfitsv(fitsin_value);
    7077 if(snimplicit) rfitsv.setImplicitSN();
    … …  
    7986 wfits.setNSamples(Nsamples);
    8087 wwfits.setNSamples(Nsamples);
     88 wfits.setNRings(1);
     89 wwfits.setNRings(1);
     90 
     91
    8192
    8293 cout << "fits writer created"<<endl;
    … …  
    8697 Toi2RING m2ring(Nsamples);
    8798 cout<<"Toi2RING created"<<endl;
     99
     100 if(sfin>=sdeb) m2ring.setRequestedSample(sdeb,sfin);
    88101
    89102 // Definition des tuyaux

  • trunk/ArchTOIPipe/files_kernel

    r1780 r2329  
    1313toisegment.cc
    1414toisegment.h
     15fitsringwtr.cc
     16fitsringwtr.h

  • trunk/ArchTOIPipe/files_pipes

    r2046 r2329  
    2222gph425_ring.cc
    2323sp.cc
     24tsttoi2ring.cc

  • trunk/ArchTOIPipe/files_sophya

    r1984 r2329  
    2121Bolos2ring.cc
    2222ring33.h
    23 ring33.cc                                                                                                                                                       
     23ring33.cc
     24toi2ring.h
     25toi2ring.cc                       
Note: See TracChangeset for help on using the changeset viewer.