Changeset 4016 in Sophya
- Timestamp:
- Aug 12, 2011, 2:26:10 PM (13 years ago)
- Location:
- trunk/AddOn/TAcq
- Files:
-
- 1 added
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/AddOn/TAcq/bracqvers.h
r4010 r4016 5 5 Software version LAL - 2008-2010 6 6 */ 7 #define BAOR_ACQ_VER 7. 58 #define BAOR_ACQ_VER_STR "BaoAcq_v7r 5_Jun11"7 #define BAOR_ACQ_VER 7.6 8 #define BAOR_ACQ_VER_STR "BaoAcq_v7r6_Aou11" 9 9 10 10 #endif -
trunk/AddOn/TAcq/branap.cc
r4015 r4016 11 11 // Classe de gestion des parametres programmes d'analyse 12 12 //-------------------------------------------------------------- 13 /*! 14 \class BRAnaParam 15 \ingroup TAcq 16 17 \brief parameter set for analysis programs (specmfib.cc , vismfib.cc) 18 */ 13 19 14 20 /* --Methode-- */ -
trunk/AddOn/TAcq/brbaseproc.cc
r3993 r4016 17 17 // redefinissent la mathode Process() qui est appele paquet par paquet 18 18 //--------------------------------------------------------------------- 19 /*! 20 \class BRBaseProcessor 21 \ingroup TAcq 22 23 \brief Base class for BAORadio processing thread classes. 24 25 Thread classes for BAORadio data processing and analysis can inherit from 26 this class and redefine/implement the Process() method which is called 27 for each BRpaquet. 28 */ 19 29 20 30 /* --Methode-- */ -
trunk/AddOn/TAcq/brdiskw.cc
r3688 r4016 14 14 // Ecriture de fichier FITS BAORadio 3D (plusieurs fibres dans un fichier) 15 15 //---------------------------------------------------------------- 16 /*! 17 \class FitsCubeWriter 18 \ingroup TAcq 19 20 \brief Writes data from multiple fibers into a single FITS file as a 3D array. 21 */ 16 22 17 23 /* --Methode-- */ -
trunk/AddOn/TAcq/brfitsrd.cc
r3979 r4016 26 26 // Classe thread de lecture de Multi-fibres de fichiers FITS BAORadio 27 27 //--------------------------------------------------------------------- 28 /*! 29 \class BRMultiFitsReader 30 \ingroup TAcq 31 32 \brief Read data from FITS files and fills RAcqMemZoneMgr memory zones. 33 34 This class read BRPaquet data from several FITS files. Data can be synchronized between 35 different files using the FrameCounter. 36 */ 28 37 29 38 /* --Methode-- */ … … 284 293 // Classe thread de lecture de fichiers fits BAORadio 285 294 //------------------------------------------------------- 295 /*! 296 \class BRFitsReader 297 \ingroup TAcq 298 299 \brief (Deprecated) Data reader from a single serie of fits files. 300 301 Use BRMultiFitsReader instead. 302 */ 286 303 287 304 /* --Methode-- */ -
trunk/AddOn/TAcq/brpaqu.cc
r3683 r4016 7 7 R. Ansari , M.Taurigna 8 8 ------------------------------------------- */ 9 10 /*! 11 \class BAORadioException 12 \ingroup TAcq 13 14 \brief Base class for exceptions used in the BAORadio acquisition software. 15 */ 16 9 17 10 18 /* --Methode-- */ … … 52 60 ((tmp & 0x000000FF) << 24); 53 61 } 62 63 /*! 64 \class BRPaquet 65 \ingroup TAcq 66 67 \brief Class representing BAORadio data paquets, as received from ADC boards 68 */ 54 69 55 70 /* --Methode__ */ … … 598 613 // Classe pour effectuer des verifications d'integrite sur les paquets/frames 599 614 // -------------------------------------------------------------------------- 615 616 /*! 617 \class BRPaqChecker 618 \ingroup TAcq 619 620 \brief Data packets (BRPaquet) objet integrity checker 621 */ 600 622 601 623 /* --Methode__ */ -
trunk/AddOn/TAcq/brpaqu.h
r3774 r4016 6 6 Juin 2008 , M.Taurigna , R. Ansari 7 7 ------------------------------------------- */ 8 9 /*! 10 \defgroup TAcq TAcq module 11 12 Class and functions for radio signal acquisition and processing 13 for the BAORadio/CRT (21 cm Cosmology). 14 15 (C) LAL-CNRS/IN2P3, Univ. Paris Sud 16 (C) Irfu/SPP-CEA 17 2008-2011 18 19 This module uses the SOPHYA class library (http://www.sophya.org) 20 */ 21 8 22 9 23 #include <stdio.h> … … 18 32 // --------------------------------------------------------- 19 33 // ----- Classe d'exception pour Acquisition BAORadio ------ 34 /*! 35 \class BAORadioException 36 \ingroup TAcq 37 38 \brief Base exception class for 21 cm acquisition programs. 39 */ 40 20 41 #define BREX_MAXMSGLEN 160 21 42 … … 40 61 // Remarque Byte = unsigned char 41 62 // Remarque SByte = char = signed char 63 /*! 64 \class TwoByteComplex 65 \ingroup TAcq 66 67 \brief Simple class to represent complex numbers formed from two 1 byte signed integers. 68 */ 42 69 class TwoByteComplex { 43 70 public: -
trunk/AddOn/TAcq/brparam.cc
r4012 r4016 8 8 #define BRSPORTID 6912 9 9 #endif 10 11 /*! 12 \class ADCBoardDesc 13 \ingroup TAcq 14 15 \brief ADC board description (board Id, firmware type, version ...) 16 */ 17 10 18 11 19 /* --Methode-- */ … … 41 49 return os; 42 50 } 51 52 /*! 53 \class BRConfList 54 \ingroup TAcq 55 56 \brief Acquisition system configuration. 57 58 Environment variables: 59 BRACQ_TMPDIR / TMPDIR 60 BRACQ_BASEDIR 61 BRACQ_FIBERIDS 62 */ 43 63 44 64 #define PMAXNBFIBRES 64 … … 146 166 147 167 // Classe qui memorise tous les parametres importants de l'acquisition 168 /*! 169 \class BRParList 170 \ingroup TAcq 171 172 \brief Acquisition parameters ( see acqparam_exemple.d datacard file ) 173 */ 148 174 149 175 /* --Methode-- */ … … 578 604 579 605 //-------------------- Classe BRAcqConfig ----------------------- 606 /*! 607 \class BRAcqConfig 608 \ingroup TAcq 609 610 \brief Defines acquisition (mfacq.cc) configuration and parameters. 611 612 See BRParList and BRConfList classes. 613 */ 580 614 581 615 BRParList* BRAcqConfig::param_=NULL; -
trunk/AddOn/TAcq/brproc.cc
r3993 r4016 37 37 // Le temps correspond au numero de paquet 38 38 //--------------------------------------------------------------------- 39 /*! 40 \class BRMeanSpecCalculator 41 \ingroup TAcq 42 43 \brief Computes mean spectra on FFT data. 44 */ 45 39 46 /* --Methode-- */ 40 47 BRMeanSpecCalculator::BRMeanSpecCalculator(RAcqMemZoneMgr& memgr, string outpath, uint_4 nmean, … … 496 503 // Classe de thread de calcul de FFT sur donnees RAW 497 504 //--------------------------------------------------------------------- 505 /*! 506 \class BRFFTCalculator 507 \ingroup TAcq 508 509 \brief Computes FFT on data from RAW ADC board firmware. 510 */ 498 511 /* --Methode-- */ 499 512 BRFFTCalculator::BRFFTCalculator(RAcqMemZoneMgr& memgr, bool fgsinglechannel) … … 540 553 // Classe WBRFFT : Calcul de TF sur donnees brutes (firmware RAW) 541 554 //------------------------------------------------------------------------- 555 /*! 556 \class WBRFFT 557 \ingroup TAcq 558 559 \brief Helper class for FFT computation used by BRFFTCalculator class. 560 561 This class uses FFTW library. 562 */ 563 542 564 ZMutex* WBRFFT::mtx_fftwp_ = NULL; 543 565 … … 604 626 // !!!! OBSOLETE !!!! 605 627 //--------------------------------------------------------------- 628 /*! 629 \class BRProcA2C 630 \ingroup TAcq 631 632 \brief Deprecated processing class. 633 */ 606 634 607 635 // Mutex pour eviter le plantage du a FFTW qui ne semble pas thread-safe … … 1031 1059 // !!!! OBSOLETE !!!! 1032 1060 //--------------------------------------------------------------------- 1061 /*! 1062 \class BRProcB4C 1063 \ingroup TAcq 1064 1065 \brief Deprecated processing class. 1066 */ 1033 1067 1034 1068 /* --Methode-- */ -
trunk/AddOn/TAcq/brprocGain.cc
r3994 r4016 38 38 // Calcul de spectres de gain 39 39 //--------------------------------------------------------------------- 40 /*! 41 \class BRGainCalculator 42 \ingroup TAcq 43 44 \brief Gain/normalization computation on spectra (developped for Nancay data) 45 */ 40 46 /* --Methode-- */ 41 47 BRGainCalculator::BRGainCalculator(RAcqMemZoneMgr& memgr, string outpath, uint_4 nmean, -
trunk/AddOn/TAcq/brviscalc.cc
r4015 r4016 24 24 // Classe de traitement - calcul de visibilite pour n fibres 25 25 //--------------------------------------------------------------------- 26 /*! 27 \class BRVisibilityCalculator 28 \ingroup TAcq 29 30 \brief Visibility computation class. 31 */ 26 32 27 33 /* --Methode-- */ … … 679 685 // Classe Groupe (ensemble) de Calculateur de Visibilites, tournant en parallele 680 686 //------------------------------------------------------------------------------- 687 /*! 688 \class BRVisCalcGroup 689 \ingroup TAcq 690 691 \brief Set of visibility calculators (parallel computation) 692 693 Each BRVisibilityCalculator object computes visibilities for a subset of pairs. 694 */ 681 695 682 696 /* --Methode-- */ -
trunk/AddOn/TAcq/mfacq.cc
r4012 r4016 3 3 //--------------------------------------------------------------- 4 4 // Programme d'acquisition BAORadio multi-fibres/multi-threads 5 // LAL - 2009 - 201 05 // LAL - 2009 - 2011 6 6 // R. Ansari, M.Taurigna 7 7 //--------------------------------------------------------------- 8 /*! 9 \ingroup TAcq 10 \file mfacq.cc 11 12 \brief BAORadio/21cm acquisition main program (see acqparam_exemple.d datacard file) 13 14 This program has four main execution modes: 15 <UL> 16 <LI> -pci2disk : PCI express DMA read of BRPaquet , data saved to disk in FITS files 17 <LI> -pci2eth : PCI express DMA read of BRPaquet, data send over ethernet to other mfacq tasks, running 18 on the same or different machines. 19 <LI> -eth2disk : read data ( BRPaquet ) on network interfaces (ethernet) and save data to disk in FITS files 20 <LI> -eth2visib : read data ( BRPaquet ) on network interfaces (ethernet), compute visibilities and save visibility 21 matrices to disk 22 </UL> 23 24 \verbatim 25 csh> mfacq -h 26 Usage: mfacq Action DataCardFileName [-dc DataCard -dc DataCard] [TargetMachines] 27 o Action = -pci2disk , -pci2eth , -eth2disk , -eth2visib 28 DataCardFile : File name for parameters list (DataCards) : 29 fibres outpathname skysource paqsize dmasizekb nbfiles 30 nblocperfile acqmode memmgr monitor reducpaqsz ... 31 o -dc DataCard : datacard appended for DataCardFileName 32 o TargetMachines : List of target machines for PCIe2Ethernet (-pci2eth) 33 34 \endverbatim 35 */ 8 36 9 37 static RAcqMemZoneMgr* pMmgr=NULL; -
trunk/AddOn/TAcq/minifits.cc
r3693 r4016 6 6 7 7 ////////////////////////////////////////////////////////////////////// 8 // /Classe MiniFITSException8 // Classe MiniFITSException 9 9 ////////////////////////////////////////////////////////////////////// 10 /*! 11 \class MiniFITSException 12 \ingroup TAcq 13 14 \brief Exception class for FITS I/O services provided by the MiniFITSFile class. 15 */ 10 16 11 17 … … 45 51 46 52 ////////////////////////////////////////////////////////////////////// 47 // /Classe MiniFITSFile53 // Classe MiniFITSFile 48 54 ////////////////////////////////////////////////////////////////////// 55 /*! 56 \class MiniFITSFile 57 \ingroup TAcq 58 59 \brief This class provides a subset of I/O services in FITS format (IMAGE_HDU only). 60 */ 49 61 50 62 #define MFITSHLEN 2880 -
trunk/AddOn/TAcq/pciewrap.cc
r3911 r4016 15 15 // Classe PCIEWrapperInterface ( virtuelle pure ) 16 16 //----------------------------------------------------------------------- 17 /*! 18 \class PCIEWrapperInterface 19 \ingroup TAcq 20 21 \brief Interface definition class for PCI-Express DMA controler 22 */ 17 23 18 24 /* --Methode-- */ … … 37 43 // Classe TestPCIWrapperNODMA : genere des paquets sans appel au DMA 38 44 //------------------------------------------------------------------ 45 /*! 46 \class TestPCIWrapperNODMA 47 \ingroup TAcq 48 49 \brief PCIEWrapperInterface implementation WITHOUT DMA for tests. 50 */ 51 39 52 /* --Methode-- */ 40 53 TestPCIWrapperNODMA::TestPCIWrapperNODMA(UInt32 sz, double lossrate) -
trunk/AddOn/TAcq/pciewrap.h
r3909 r4016 15 15 16 16 using namespace std; 17 18 /*! 19 \class PCIEWException 20 \ingroup TAcq 21 22 \brief exception class for PCI-express operations. 23 */ 17 24 18 25 class PCIEWException { -
trunk/AddOn/TAcq/racqueth.cc
r3923 r4016 25 25 // Classe thread de lecture PCI-Express et recopie sur interface reseau (Ethernet) 26 26 //---------------------------------------------------------------------------------------------------------- 27 28 /*! 29 \class PCIEToEthernet 30 \ingroup TAcq 31 32 \brief Performs data reception (DMA) on PCI-Express and sends data over ethernet (TCP/IP network interface) 33 34 This class handles ethernet/network connections, reads data formatted as BRPaquet objects through PCI-Express DMA's 35 and sends the received data to EthernetReader over network/ethernet, \b without ging through the memory manager 36 RAcqMemZoneMgr object. 37 */ 27 38 28 39 // Si on veut avoir le protocole de controle (Hand-shake) entre l'emetteur et le recepteur, … … 435 446 // Classe thread de lecture sur interface reseau (Ethernet) 436 447 //------------------------------------------------------------------ 448 /*! 449 \class EthernetReader 450 \ingroup TAcq 451 452 \brief Performs data reception (BRPaquet format) over ethernet (TCP/IP network interface) 453 454 This class ethernet/network connections, and reads data formatted as BRPaquet objects send by PCIEToEthernet objects. 455 Data is transferred to an RAcqMemZoneMgr object memory buffers. A single EthernetReader can handle multiple 456 connections (data reception from several PCIEToEthernet senders) and can optionnaly synchronize data using the 457 FrameCounter. 458 */ 437 459 438 460 /* --Methode-- */ -
trunk/AddOn/TAcq/racqumem.cc
r3979 r4016 7 7 // LAL - R. Ansari - Juin/Juillet 2008 8 8 //---------------------------------------------------------------- 9 10 /*! 11 \class RAcqMemZoneMgr 12 \ingroup TAcq 13 14 \brief Memory Manager class for multi-threaded acquisition and processing software 15 16 This class is the central memory hub through which different threads (I/O, processing, monitoring) 17 are synchronized. 18 */ 9 19 10 20 /* --Methode-- */ -
trunk/AddOn/TAcq/racquproc.cc
r3945 r4016 38 38 // Classe thread de traitement/monitoring multifibre Raw/FFT 39 39 //--------------------------------------------------------------------- 40 /*! 41 \class MonitorProc 42 \ingroup TAcq 43 44 \brief Monitoring thread class for BAORadio/CRT acquisition program. 45 46 This class can handle data from Raw data firmware, as well as FFT firmware, 47 one and two channels per fiber. 48 */ 49 40 50 /* --Methode-- */ 41 51 MonitorProc::MonitorProc(RAcqMemZoneMgr& mem) … … 687 697 // Classe thread de traitement avec 1 voie par frame 688 698 //------------------------------------------------------- 699 /*! 700 \class DataProc 701 \ingroup TAcq 702 703 \brief Deprecated monitoring class (replaced by MonitorProc) 704 */ 689 705 690 706 void DataProcSignal(int s) … … 801 817 // Classe thread de traitement donnees ADC avec 2 voies par frame 802 818 //--------------------------------------------------------------- 819 820 /*! 821 \class DataProc2C 822 \ingroup TAcq 823 824 \brief Deprecated monitoring class (replaced by MonitorProc) 825 */ 803 826 804 827 DataProc2C::DataProc2C(RAcqMemZoneMgr& mem, string& path, uint_4 nmean, uint_4 step, uint_4 nmax) … … 923 946 // Classe thread de traitement donnees FFT avec 2 voies par frame 924 947 //--------------------------------------------------------------- 948 /*! 949 \class DataProcFFT2C 950 \ingroup TAcq 951 952 \brief Deprecated monitoring class (replaced by MonitorProc) 953 */ 925 954 926 955 inline r_4 Zmod2TwoByte(TwoByteComplex z) -
trunk/AddOn/TAcq/racqurw.cc
r3954 r4016 28 28 // Classe thread de lecture PCI-Express 29 29 //------------------------------------------------------- 30 31 /*! 32 \class PCIEReader 33 \ingroup TAcq 34 35 \brief PCI-Express data read-out thread class \b (deprecated) 36 37 \b Deprecated - Use PCIEMultiReader instead. 38 DMA through the PCIEWrapperInterface object interface and tranfer to RAcqMemZoneMgr memory 39 */ 30 40 31 41 PCIEReader::PCIEReader(PCIEWrapperInterface &pciw,uint_4 sizeFrame,uint_4 packSize ,RAcqMemZoneMgr& mem, … … 189 199 //------------------------------------------------------- 190 200 201 /*! 202 \class DataSaver 203 \ingroup TAcq 204 205 \brief Data saver in FITS format thread class \b (deprecated) 206 207 \b Deprecated - Use MultiDataSaver instead. 208 BRPaquets are dumped to disk in FITS format. 209 */ 210 191 211 DataSaver::DataSaver(RAcqMemZoneMgr& mem, string& path, uint_4 nfiles, uint_4 nblocperfile, bool savesig) 192 212 : memgr(mem) … … 336 356 //---------------------------------------------------------------------------------------------------------- 337 357 358 /*! 359 \class PCIEReaderChecker 360 \ingroup TAcq 361 362 \brief PCI-Express data read-out and BRPaquet structure check 363 364 */ 365 366 338 367 PCIEReaderChecker::PCIEReaderChecker(PCIEWrapperInterface &pciw, uint_4 sizeFrame,uint_4 packSize, RAcqMemZoneMgr& mem, 339 368 uint_4 nmax, BRDataFmtConv swapall) … … 466 495 // Classe thread de lecture PCI-Express + Check pour tests de verification de debit/etc avec un seul thread 467 496 //---------------------------------------------------------------------------------------------------------- 497 /*! 498 \class PCIEMultiReader 499 \ingroup TAcq 500 501 \brief PCI-Express data read-out thread class from multiple fibres (sources) 502 503 Perform DMA through the set PCIEWrapperInterface object interfaces and tranfer date to RAcqMemZoneMgr memory. 504 */ 468 505 469 506 /* --Methode-- */ … … 758 795 // Classe thread de sauvegarde sur fichiers avec gestion multifibres 759 796 //-------------------------------------------------------------------- 797 /*! 798 \class MultiDataSaver 799 \ingroup TAcq 800 801 \brief Data saver in FITS format thread class for multiple BRPaquet sources (fibres) 802 803 BRPaquets from each source (fibre) are dumped to disk in separate files in FITS format. 804 */ 760 805 761 806 /* --Methode-- */ -
trunk/AddOn/TAcq/specmfib.cc
r3993 r4016 5 5 /* ---------------------------------------------------------- 6 6 Programme de lecture multifibres, calcul de spectres 7 BAORadio - LAL/IRFU R. Ansari, C. Magneville 8 Septembre2010 - 20117 BAORadio - LAL/IRFU R. Ansari, C. Magneville, J.E. Campagne 8 2010 - 2011 9 9 ---------------------------------------------------------- */ 10 /*! 11 \ingroup TAcq 12 \file specmfib.cc 13 14 \brief Data cleaning and computation of mean spectrum of gain/normalization spectrum 15 16 This program uses the BRMeanSpecCalculator, BRGainCalculator and BRMultiFitsReader classes 17 to clean data and compute mean spectra and normalization/gain spectrum from 18 raw or FFT data read from FITS files (data in BRPaquet format). 19 The BRFFTCalculator class is used to compute fourier coefficients on raw data and 20 BRAnaParam class is used for defining and decoding the program run parameters. 21 22 \verbatim 23 csh> specmfib 24 ===> specmfib.cc: decoding command line arguments 25 --- BRAnaParam : Reading/Processing BAORadio FITS files parameters 26 Usage: prgname [-act ACT] [-out OutPath] [-fitsout] 27 [-nmean NMean] [-tmint dtime] [-zones NZones,nPaqinZone] 28 [-nbloc NBloc] [-freq NumFreqMin,NumFreqMax,NBinFreq] 29 [-prt lev,modulo,mod2] [-nvcal n] [-nthr n] [-nosfc] 30 [-singlechan] [-twochan] [-fftdata] [-rawdata] 31 [-freqfilter medhw] [-gain filename] [-varcut min,max] [-nband nband,first,last] 32 [-freqfilter] [-gain filename] [-varcut min,max] [-nband nband,first,last] 33 [-tmproc hh:mm:ss,nseconds] [-fdtpaq] [-fdtms] [-tspwin wsz,extsz,nfiles] 34 -in Imin,Imax,Istep InPath FiberList [InPath2 FiberList2 InPath3 FiberList3 ...] 35 36 prgname -h for detailed instructions 37 \endverbatim 38 */ 10 39 11 40 // include standard c/c++ -
trunk/AddOn/TAcq/vismfib.cc
r4015 r4016 6 6 Programme de lecture / calcul de visibilite multi-canaux 7 7 BAORadio - LAL/IRFU R. Ansari, C. Magneville 8 V1 : Nov 20098 2009-2011 9 9 ---------------------------------------------------------- */ 10 /*! 11 \ingroup TAcq 12 \file vismfib.cc 13 14 \brief Computation of visibilities from FITS raw of fft data files. 15 16 This program uses the BRVisCalcGroup / BRVisibilityCalculator and BRMultiFitsReader classes 17 to compute visibility matrices for raw or FFT data from FITS files containing data in BRPaquet 18 format. The BRFFTCalculator class is used to compute fourier coefficients on raw data and 19 BRAnaParam class is used for defining and decoding the program run parameters. 20 21 \verbatim 22 csh> vismfib 23 ===> visimfib.cc: decoding command line arguments 24 --- BRAnaParam : Reading/Processing BAORadio FITS files parameters 25 Usage: prgname [-act ACT] [-out OutPath] [-fitsout] 26 [-nmean NMean] [-tmint dtime] [-zones NZones,nPaqinZone] 27 [-nbloc NBloc] [-freq NumFreqMin,NumFreqMax,NBinFreq] 28 [-prt lev,modulo,mod2] [-nvcal n] [-nthr n] [-nosfc] 29 [-singlechan] [-twochan] [-fftdata] [-rawdata] 30 [-freqfilter medhw] [-gain filename] [-varcut min,max] [-nband nband,first,last] 31 [-freqfilter] [-gain filename] [-varcut min,max] [-nband nband,first,last] 32 [-tmproc hh:mm:ss,nseconds] [-fdtpaq] [-fdtms] [-tspwin wsz,extsz,nfiles] 33 -in Imin,Imax,Istep InPath FiberList [InPath2 FiberList2 InPath3 FiberList3 ...] 34 35 prgname -h for detailed instructions 36 37 \endverbatim 38 */ 10 39 11 40 // include standard c/c++
Note: See TracChangeset
for help on using the changeset viewer.