Changeset 3680 in Sophya for trunk/AddOn/TAcq


Ignore:
Timestamp:
Nov 16, 2009, 3:38:23 PM (16 years ago)
Author:
ansari
Message:

Corrections apres compilation sur pc-bao2 sans le flag NOPCIECARD, Reza 16/11/2009

Location:
trunk/AddOn/TAcq
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/AddOn/TAcq/brparam.h

    r3674 r3680  
    108108  inline uint_4 MaxNbBlocs() { return NbFiles*NBlocPerFile; }
    109109
     110  // Taille des paquets recus sur PCIExpress
     111  inline uint_4 PatternSize() { return ((PaqSize-(BRHDRSIZE+BRTRLSIZE))/4); }
     112
    110113  // Identification source ciel
    111114  inline string& SkySource() { return skysource; }

  • trunk/AddOn/TAcq/mfacq.cc

    r3674 r3680  
    128128
    129129#ifndef NOPCIECARD 
     130
    130131  for (int i=0 ;i <acpar.NFibers() ;i++) {
    131132    UINT32 card=(acpar.FiberNum[i]-1)/2+1;
    132     UINT32 cardfiber=(acpar.FiberNum[i]-1)%2
     133    UINT32 cardfiber=(acpar.FiberNum[i]-1)%2;
    133134    cout <<"mfacq[2] CreatePCIEWrapperV6- indice " << i <<  "INIT card " << card
    134135         << " fibre " << cardfiber << endl;
    135     pciwp[i] =  CreatePCIEWrapperV6(card,patternSZ,dmaSize,activate_pattern,cardfiber);
     136    pciwp[i] =  CreatePCIEWrapperV6(card,acpar.PatternSize(),acpar.dmasizekb,acpar.activate_pattern,cardfiber);
    136137  }
    137138#else

  • trunk/AddOn/TAcq/mfacq.h

    r3671 r3680  
    1414#ifndef NOPCIECARD
    1515#include "racquwbin.h"
     16#include "dmamgrv6.h"
    1617#endif
    1718#include "racquproc.h"
Note: See TracChangeset for help on using the changeset viewer.