Changeset 3883 in Sophya for trunk/AddOn/TAcq/brparam.cc


Ignore:
Timestamp:
Sep 23, 2010, 7:59:29 PM (15 years ago)
Author:
ansari
Message:

1/ Correction bug de lecture ds BRMultiFitsReader et EthernetReader lorsque lecture avec SameFrameCounter etait demande
2/ Amelioration des impressions ds ces deux classes et ajout possibilite de controle du flag "SameFC" avec les classes de parametres BRParList et BRAnaParam
3/ Nouveaux datacard @ethrforcesamefc et @prtlev pour acquisition

Reza, 23/09/2010

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/AddOn/TAcq/brparam.cc

    r3876 r3883  
    136136  pci2eth_fgdirect=false;
    137137  ethr_nlink = 0;
     138  ethr_forcesamefc_ = false;
    138139
    139140  skysource="";
     
    157158  nopciLossRate=0.;
    158159
     160// niveau d'impression,debug ...
     161  prtlevel_=0;
     162  prtmodulo_=50000;
    159163  Decode();    // On decode et on complete les parametres
    160164}
     
    203207  eths_targets=p.eths_targets;
    204208  ethr_nlink=p.ethr_nlink;
     209  ethr_forcesamefc_=p.ethr_forcesamefc_;
    205210
    206211  skysource=p.skysource;
     
    215220
    216221  nopciLossRate=p.nopciLossRate;
     222
     223  prtlevel_=p.prtlevel_;
     224  prtmodulo_=p.prtlevel_;
     225
    217226  return;
    218227}
     
    245254  }
    246255  ethr_nlink=conf.IParam("ethrnlink",0,0);   // Nombre de sources de paquets en reception ethernet
     256  if (conf.HasKey("ethrforcesamefc"))   ethr_forcesamefc_=true;   // force SAME FrameCounter   on all links
    247257
    248258  //  Parametre de controle du monitoring
     
    269279  fg_hard_ctrlc=conf.HasKey("hard_ctrlc");
    270280  if (conf.HasKey("nosavesigfits"))  savesigfits=false;
     281  if (conf.HasKey("prtlev"))  {
     282    prtlevel_=conf.IParam("prtlev",0,0);
     283    prtmodulo_=conf.IParam("prtlev",1,50000);
     284  }
     285 
    271286  Decode();
    272287}
     
    372387    cout << endl;
    373388  }
    374   cout << " TCP-PortId=" << tcpportid << " EthernetRead NbSources (=NbLinks)= " << ethr_nlink << endl;
     389  cout << " TCP-PortId=" << tcpportid << " EthernetRead NbSources (=NbLinks)= " << ethr_nlink
     390       << ((ethr_forcesamefc_)?" ForceSameFrameCounter read mode":" AllOKPaquets read mode ") << endl;
     391
    375392  if (fgdoProc>0)
    376393    os << " Monitoring  NMeanProc=" << nmeanProc << " StepProc=" << stepProc << " NMaxProc=" << nmaxProc << endl;
     
    385402  os << " monothr y(1)/n(0) " << ((monothr)?"true":"false");
    386403  os << " ActivatePattern " << ((activate_pattern)?"true":"false") <<  endl;
    387  
     404  os << " PrtLevel=" << prtlevel_ << " PrtCntModulo=" <<  prtmodulo_ << endl;
     405
    388406  return os;
    389407}
Note: See TracChangeset for help on using the changeset viewer.