Changeset 1739 in Sophya for trunk/ArchTOIPipe


Ignore:
Timestamp:
Nov 8, 2001, 6:47:38 PM (24 years ago)
Author:
cmv
Message:

Le DataSmooth cmv 8/11/2001

Location:
trunk/ArchTOIPipe
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ArchTOIPipe/ProcWSophya/Makefile.in

    r1733 r1739  
    4242
    4343
    44 SRCFILES=map2toi.cc toi2map.cc rztoi.cc simtoipr.cc ktoibad.cc
     44SRCFILES=map2toi.cc toi2map.cc rztoi.cc simtoipr.cc ktoibad.cc smoothtoi.cc
    4545
    4646FILES=$(patsubst %.c,%.o,$(SRCFILES:.cc=.o))

  • trunk/ArchTOIPipe/ProcWSophya/ktoibad.cc

    r1737 r1739  
    172172int_4 lmmin = lm/2; if(lmmin<2) lmmin=2;
    173173
    174 
     174// Initialisation
     175if(LSide>0) for(int_4 sn=snb;sn<snb+LSide && sn<=sne;sn++) {
     176  r_8 bolog; uint_8 fgbolog=0;
     177  getData(0,sn,bolog,fgbolog);
     178  if(!(fgbolog & flgNotLookAt)) Slpb[1]->Push((r_8)sn,bolog);
     179}
    175180
    176181for(int_4 sn=snb;sn<=sne;sn++) {

  • trunk/ArchTOIPipe/ProcWSophya/toi2map.h

    r1738 r1739  
    55//                               Christophe Magneville
    66//                               Reza Ansari
    7 // $Id: toi2map.h,v 1.7 2001-11-08 15:47:46 aubourg Exp $
     7// $Id: toi2map.h,v 1.8 2001-11-08 17:47:23 cmv Exp $
    88
    99#ifndef TOI2MAP_H
    … …  
    5050              {mTypCoorOut = mfg;}
    5151  // Test on flag value ? if yes, BAD sample have flag matching mBadFlag
    52   inline void SetTestFlag(bool tflg=false, uint_8 badflg=0)
     52  inline void SetTestFlag(bool tflg=false, uint_8 badflg=FlgToiAll)
    5353              {mTFlag = tflg; mBadFlag = badflg;}
    5454  // Test on min value ? if yes, GOOD sample have value >= mValMin

  • trunk/ArchTOIPipe/TestPipes/tstktoibad.cc

    r1736 r1739  
    99#include "sophyainit.h"
    1010#include "ktoibad.h"
     11#include "smoothtoi.h"
    1112
    1213void usage(void);
    … …  
    1819 <<" -g lg,lm,nsg,bupd"
    1920 <<" -a lmaround"
     21 <<" -S lsmooth,sdeg"
    2022 <<" -p lp,sn1,sn2"
    2123 <<endl;
    … …  
    2729 int_4 lp=1,sn1=-1,sn2=-1;
    2830 uint_4 lg=3,lm=15,bupd=1000,lmaround=10;
     31 uint_4 lsmooth=1024,sdeg=2;
    2932 r_8 nsg=5.;
    3033 r_8 vmin=1.,vmax=-1.;
    3134 char *label_bolomuv = "boloMuV";
    3235  int c;
    33  while((c = getopt(narg,arg,"hs:g:d:b:a:p:")) != -1) {
     36 while((c = getopt(narg,arg,"hs:g:d:b:a:S:p:")) != -1) {
    3437  switch (c) {
    3538  case 's' :
    … …  
    4447  case 'a' :
    4548   sscanf(optarg,"%d",&lmaround);
     49   break;
     50  case 'S' :
     51   sscanf(optarg,"%d,%d",&lsmooth,&sdeg);
    4652   break;
    4753  case 'b' :
    … …  
    9096 flgaround.Print();
    9197
     98 DataSmooth dsmooth(lsmooth,sdeg);
     99 dsmooth.Print();
     100
    92101 ////// Creation des tuyaux et des connections associees
    93102 int taille = 8192;
    … …  
    108117 flgaround.addInput("DataIn",toi2);
    109118
    110  // tuyau bolo pour entree fits writer
     119 // tuyau bolo pour smooth DataSmooth et fits writer
    111120 TOISegmented * toi3 = new TOISegmented("tuyau_bolo_3",taille);
    112121 flgaround.addOutput("DataOut",toi3);
     122 dsmooth.addInput("DataIn",toi3);
    113123 wfits.addInput(label_bolomuv,toi3,true);
     124
     125 // tuyau bolo pour entree fits writer
     126 TOISegmented * toi31 = new TOISegmented("tuyau_bolo_31",taille);
     127 dsmooth.addOutput("DataSmooth",toi31);
     128 wfits.addInput("smbolo",toi31,true);
    114129
    115130 // Print de status avant lancement des taches:
    … …  
    123138 toi2->PrintStatus(cout); 
    124139 toi3->PrintStatus(cout); 
     140 toi31->PrintStatus(cout); 
    125141 cout<<"-----FlagOutOfRange ::PrintStatus() : -----"<<endl;
    126142 flgout.PrintStatus(cout); 
    … …  
    129145 cout<<"-----FlagAround ::PrintStatus() : -----"<<endl;
    130146 flgaround.PrintStatus(cout); 
     147 cout<<"-----DataSmooth ::PrintStatus() : -----"<<endl;
     148 dsmooth.PrintStatus(cout); 
    131149
    132150 // Lancement des taches
    … …  
    137155 deglitch.start();
    138156 flgaround.start(); 
     157 dsmooth.start(); 
    139158
    140159 // Gestion de la re-connection des threads

  • trunk/ArchTOIPipe/TestPipes/tsttoi2map.cc

    r1723 r1739  
    8585    cout<<"Requested Samples from "<<sdeb<<" , "<<sfin<<endl;
    8686    if(sfin>=sdeb) mgr->setRequestedSample(sdeb,sfin);
    87     else {cout<<"Bad sample interval "<<endl; exit(2);}
     87    //else {cout<<"Bad sample interval "<<endl; exit(2);}
    8888    break;
    8989  case 'w' :

  • trunk/ArchTOIPipe/files_sophya

    r1733 r1739  
    1010ktoibad.h
    1111ktoibad.cc
     12smoothtoi.h
     13smoothtoi.cc
Note: See TracChangeset for help on using the changeset viewer.