Changeset 534 in Sophya for trunk/Poubelle/archTOI.old/formepulse.cc

Timestamp:

Nov 1, 1999, 10:59:29 AM (26 years ago)

Author:

ansari

Message:

V2

File:

• trunk/Poubelle/archTOI.old/formepulse.cc (modified) (9 diffs)

trunk/Poubelle/archTOI.old/formepulse.cc

@@ -2 +2 @@
 #include <fstream.h>
 
+// D. Yvon, CE Saclay, DAPNIA/SPP, 08/99
 
 #include <math.h>
@@ -13 +14 @@
 #include "ssthardware.h"
 
-
 #define LTab (2048)
-#define LSave (128)
+#define LSave (256)
 #define Tpas (5.e-4)
 //float PulseOptOrigin=LTab/16.*Tpas;
@@ -22 +22 @@
 //#define DYTestRun
 
-
+/*
+FormePulse::FormePulse() {
+        gainElec=0.;
+        FullwidthHalfMax=0;
+        ShapeArr=new double[LSave];
+        for(int i=0; i<LSave; i++)  ShapeArr[i]=0.;
+}
+*/
 
 FormePulse::FormePulse(TransFuncElec TF) {
@@ -129 +136 @@
         for(int i=0; i<LSave; i++)  ShapeArr[i]=PulseInReel[i]/Max;
 
-#ifdef DYTestRun        
+//#ifdef DYTestRun      
                 //On ecrit le resultat dans un fichier 
                 char s2[32]="Resultatfiltrage.txt";
@@ -139 +146 @@
 
                 dlout<<"Impulsion courant de: "<<SSTFPulseCourant<<" Ampères"<<endl;
-                dlout<<"Maximum d'amplitude: "<<max<< " Volts"<<endl;
-                dlout<<" gain chaine preampli: "<<gainElec<<endl<<endl;
+                dlout<<"Maximum d'amplitude: "<<Max<< " Volts"<<endl;
+                dlout<<" gain chaine preampli: "<<gainElec<<endl;
+                dlout<<"largueur a mi hauteur: "<<FullwidthHalfMax<<endl<<endl;
                 dlout<<"Temps"<<"\tPartie Reelle"<<endl;
 
@@ -146 +154 @@
                         dlout<<k*Tpas<<"\t"<<ShapeArr[k]<<endl;
                 }       
-#endif
+//#endif
 
 
@@ -163 +171 @@
         return *this;
 }
-        
+
 FormePulse::~FormePulse() {
         delete[] ShapeArr;
@@ -174 +182 @@
 
 double FormePulse::PulseShape(double temps) {
+        double returnValue;
         int ientier=(int)(temps/Tpas);
-        double returnValue;
         if (ientier<0) returnValue=0.;
-        else if (ientier>=LSave) returnValue= ShapeArr[127];
+        else if (ientier>=LSave) returnValue= ShapeArr[LSave-1];
         else {
                 double Min=ShapeArr[ientier];
@@ -193 +201 @@
         //en secondes
         return returnVal;
+//      return returnVal=30.e-3;                        //Gros BUGG!!!!!
 }