Changeset 3645 in Sophya for trunk/AddOn/TAcq/tmtacq.cc

Timestamp:

Jun 1, 2009, 10:24:41 PM (16 years ago)

Author:

ansari

Message:

Traitement 4 canaux ds brproc.cc, mcrd.cc , mais il reste des problemes - Reza 01/06/2009

File:

• trunk/AddOn/TAcq/tmtacq.cc (modified) (2 diffs)

trunk/AddOn/TAcq/tmtacq.cc

@@ -410 +410 @@
   else {
     dmap = new DMAMgr(card,patternSZ,dmaSize,activate_pattern); 
-    if (! dmap->StatusFibre() ) {
-      cout << " tmtacq[3] - fibre non accrochee -> exit " << endl;
-      throw PCIEWException(" Fibre non accrochee ");
+    if (!activate_pattern) {
+      if (! dmap->StatusFibre() ) {
+        cout << " tmtacq[3] - fibre non accrochee -> exit " << endl;
+        throw PCIEWException(" Fibre non accrochee ");
+      }
+      else cout << " tmtacq[3] - fibre accrochee OK " << endl;
     }
-    else cout << " tmtacq[3] - fibre accrochee OK " << endl;
     pciwp = new PCIEWrapper(*dmap); 
   }
@@ -509 +511 @@
   else {
     dmap1 = new DMAMgr(cardlist[0],patternSZ,dmaSize,activate_pattern); 
-    if (! dmap1->StatusFibre() ) {
-      cout << " tmtacq[3] - fibre non accrochee Card" << cardlist[0] << " -> exit " << endl;
-      throw PCIEWException(" Fibre non accrochee 1");
+    if (!activate_pattern) {
+      if (! dmap1->StatusFibre() ) {
+        cout << " tmtacq[3] - fibre non accrochee Card" << cardlist[0] << " -> exit " << endl;
+        throw PCIEWException(" Fibre non accrochee 1");
+      }
+      else cout << " tmtacq[3] - fibre accrochee OK Card " << cardlist[0] << endl;
+
+      dmap2 = new DMAMgr(cardlist[1],patternSZ,dmaSize,activate_pattern); 
+      if (! dmap2->StatusFibre() ) {
+        cout << " tmtacq[3] - fibre non accrochee Card" << cardlist[1] << " -> exit " << endl;
+        throw PCIEWException(" Fibre non accrochee 2");
+      }
+      else cout << " tmtacq[3] - fibre accrochee OK Card " << cardlist[1] << endl;
     }
-    else cout << " tmtacq[3] - fibre accrochee OK Card " << cardlist[0] << endl;
-
-    dmap2 = new DMAMgr(cardlist[1],patternSZ,dmaSize,activate_pattern); 
-    if (! dmap2->StatusFibre() ) {
-      cout << " tmtacq[3] - fibre non accrochee Card" << cardlist[1] << " -> exit " << endl;
-      throw PCIEWException(" Fibre non accrochee 2");
-    }
-    else cout << " tmtacq[3] - fibre accrochee OK Card " << cardlist[1] << endl;
     pciwp1 = new PCIEWrapper(*dmap1); 
     pciwp2 = new PCIEWrapper(*dmap2);