Changeset 1148 in Sophya for trunk/SigPredictor/maketimeline.cc

Timestamp:

Aug 29, 2000, 12:03:24 PM (25 years ago)

Author:

ansari

Message:

mise a jour

File:

• trunk/SigPredictor/maketimeline.cc (modified) (9 diffs)

trunk/SigPredictor/maketimeline.cc

@@ -4 +4 @@
 #include <stdlib.h>
 #include <iostream>
+
+
 #include "makebolotimeline.h"
 #include "bruit.h"
@@ -9 +11 @@
 
 #ifdef __MWERKS__
+        #include "dyyield.h"
    #include "macenvvariables.h"
    #define SetNlatLSource (256)         // version debug
-   #define NbSAMPLE (2000)                      //      Pour le debug
+   #define NbSAMPLE (200000)                    //      Pour le debug
 #else
    # define ERROR_LABEL -32768
@@ -19 +22 @@
 
 
+
 #include "alllobe.h"
 #include "alllightsources.h"
 #include "sigcalctools.h"
 #include "allfilter.h"
-#include "fitsioserver.h"
-
 
 
@@ -32 +34 @@
 int MakeArcheopsTimelines(char FilePointes[])
 {
-
-/*
 
 // On genre des timelines de bruit en 1/f
@@ -39 +39 @@
         GenTimLin1_F(NbSAMPLE,5.83e-3,0.5);
         GenTimLin1_F(NbSAMPLE,5.83e-3,0.1);
-*/
+
         
 // On passe aux cartes de fonds physiques
 // Initialisations
-   FitsIoServer FitsServer;
    char filename[150]="";
      
@@ -120 +119 @@
         // Bolo 2_4 soit bolo9.
         sprintf(fileOut, "ASigPred_bolo2_4Dipole");
-        MakeBoloTimeline TL2_4Dipole(fileOut, CMBDipole,GLobeTrapChan1,
-                FiltreTrapChan1,RayleighJeans);
+        MakeBoloTimeline TL2_4Dipole(fileOut, CMBDipole,GLobeTrapChan2,
+                FiltreTrapChan2,RayleighJeans);
 
         sprintf(fileOut, "ASigPred_bolo2_4CMBPrim");
-        MakeBoloTimeline TL2_4CMBPrim(fileOut, CMBPrim,GLobeTrapChan1,
-                FiltreTrapChan1,RayleighJeans); 
+        MakeBoloTimeline TL2_4CMBPrim(fileOut, CMBPrim,GLobeTrapChan2,
+                FiltreTrapChan2,RayleighJeans); 
                 
         sprintf(fileOut, "ASigPred_bolo2_4DiffDust");
-        MakeBoloTimeline TL2_4DiffDust(fileOut,DiffDust,GLobeTrapChan1,
-                FiltreTrapChan1,RayleighJeans);
+        MakeBoloTimeline TL2_4DiffDust(fileOut,DiffDust,GLobeTrapChan2,
+                FiltreTrapChan2,RayleighJeans);
                 
         // Bolo 2_5 soit bolo4.
         sprintf(fileOut, "ASigPred_bolo2_5Dipole");
-        MakeBoloTimeline TL2_5Dipole(fileOut, CMBDipole,GLobeTrapChan1,
-                FiltreTrapChan1,RayleighJeans);
+        MakeBoloTimeline TL2_5Dipole(fileOut, CMBDipole,GLobeTrapChan2,
+                FiltreTrapChan2,RayleighJeans);
 
         sprintf(fileOut, "ASigPred_bolo2_5CMBPrim");
-        MakeBoloTimeline TL2_5CMBPrim(fileOut, CMBPrim,GLobeTrapChan1,
-                FiltreTrapChan1,RayleighJeans); 
+        MakeBoloTimeline TL2_5CMBPrim(fileOut, CMBPrim,GLobeTrapChan2,
+                FiltreTrapChan2,RayleighJeans); 
 
         sprintf(fileOut, "ASigPred_bolo2_5DiffDust");
-        MakeBoloTimeline TL2_5DiffDust(fileOut,DiffDust,GLobeTrapChan1,
-                FiltreTrapChan1,RayleighJeans);
+        MakeBoloTimeline TL2_5DiffDust(fileOut,DiffDust,GLobeTrapChan2,
+                FiltreTrapChan2,RayleighJeans);
                                 
         // Bolo 3_6 soit bolo15.
         sprintf(fileOut, "ASigPred_bolo3_6Dipole");
-        MakeBoloTimeline TL3_6Dipole(fileOut, CMBDipole,GLobeTrapChan1,
-                FiltreTrapChan1,RayleighJeans);
+        MakeBoloTimeline TL3_6Dipole(fileOut, CMBDipole,GLobeTrapChan3,
+                FiltreTrapChan3,RayleighJeans);
         
         sprintf(fileOut, "ASigPred_bolo3_6CMBPrim");
-        MakeBoloTimeline TL3_6CMBPrim(fileOut, CMBPrim,GLobeTrapChan1,
-                FiltreTrapChan1,RayleighJeans); 
+        MakeBoloTimeline TL3_6CMBPrim(fileOut, CMBPrim,GLobeTrapChan3,
+                FiltreTrapChan3,RayleighJeans); 
 
         sprintf(fileOut, "ASigPred_bolo3_6DiffDust");
-        MakeBoloTimeline TL3_6DiffDust(fileOut,DiffDust,GLobeTrapChan1,
-                FiltreTrapChan1,RayleighJeans);
+        MakeBoloTimeline TL3_6DiffDust(fileOut,DiffDust,GLobeTrapChan3,
+                FiltreTrapChan3,RayleighJeans);
                 
                 
@@ -197 +196 @@
                 if (nbParamLu!=11) {
                         cerr<<" Problme a la lecture du fichier: "<<FileName<<endl;
-                        cerr<<" Ligne :"<<compteur<<endl;
+                        cerr<<" Ligne :"<<Line<<endl; 
                 }
-                
-        // On remplit les fichiers correspondants 
-                TL1_1Dipole.addToStreamArchTOI(alphaBolo1_1,deltaBolo1_1);
-                TL1_1CMBPrim.addToStreamArchTOI(alphaBolo1_1,deltaBolo1_1);
-                TL1_1DiffDust.addToStreamArchTOI(alphaBolo1_1,deltaBolo1_1);
-                
-                TL1_3Dipole.addToStreamArchTOI(alphaBolo1_3,deltaBolo1_3);
-                TL1_3CMBPrim.addToStreamArchTOI(alphaBolo1_3,deltaBolo1_3);
-                TL1_3DiffDust.addToStreamArchTOI(alphaBolo1_3,deltaBolo1_3);
-                
-                TL2_4Dipole.addToStreamArchTOI(alphaBolo2_4,deltaBolo2_4);
-                TL2_4CMBPrim.addToStreamArchTOI(alphaBolo2_4,deltaBolo2_4);
-                TL2_4DiffDust.addToStreamArchTOI(alphaBolo2_4,deltaBolo2_4);
-                
-                TL2_5Dipole.addToStreamArchTOI(alphaBolo2_5,deltaBolo2_5);
-                TL2_5CMBPrim.addToStreamArchTOI(alphaBolo2_5,deltaBolo2_5);
-                TL2_5DiffDust.addToStreamArchTOI(alphaBolo2_5,deltaBolo2_5);
-                
-                TL3_6Dipole.addToStreamArchTOI(alphaBolo3_6,deltaBolo3_6);
-                TL3_6CMBPrim.addToStreamArchTOI(alphaBolo3_6,deltaBolo3_6);
-                TL3_6DiffDust.addToStreamArchTOI(alphaBolo3_6,deltaBolo3_6);
-                
-                compteur++;
-                if((compteur%1000)==0)
-                {       double pourcent=100.*compteur/NbSAMPLE;
-                        cout<<"Compteur= "<<compteur<<endl;
-                        cout<<"Travail effectue a :"<<pourcent<<" %"<<endl;
+                else 
+                {
+                // On remplit les fichiers correspondants 
+                        TL1_1Dipole.addToStreamArchTOI(alphaBolo1_1,deltaBolo1_1);
+                        TL1_1CMBPrim.addToStreamArchTOI(alphaBolo1_1,deltaBolo1_1);
+                        TL1_1DiffDust.addToStreamArchTOI(alphaBolo1_1,deltaBolo1_1);
+                        
+                        TL1_3Dipole.addToStreamArchTOI(alphaBolo1_3,deltaBolo1_3);
+                        TL1_3CMBPrim.addToStreamArchTOI(alphaBolo1_3,deltaBolo1_3);
+                        TL1_3DiffDust.addToStreamArchTOI(alphaBolo1_3,deltaBolo1_3);
+                        
+                        TL2_4Dipole.addToStreamArchTOI(alphaBolo2_4,deltaBolo2_4);
+                        TL2_4CMBPrim.addToStreamArchTOI(alphaBolo2_4,deltaBolo2_4);
+                        TL2_4DiffDust.addToStreamArchTOI(alphaBolo2_4,deltaBolo2_4);
+                        
+                        TL2_5Dipole.addToStreamArchTOI(alphaBolo2_5,deltaBolo2_5);
+                        TL2_5CMBPrim.addToStreamArchTOI(alphaBolo2_5,deltaBolo2_5);
+                        TL2_5DiffDust.addToStreamArchTOI(alphaBolo2_5,deltaBolo2_5);
+                        
+                        TL3_6Dipole.addToStreamArchTOI(alphaBolo3_6,deltaBolo3_6);
+                        TL3_6CMBPrim.addToStreamArchTOI(alphaBolo3_6,deltaBolo3_6);
+                        TL3_6DiffDust.addToStreamArchTOI(alphaBolo3_6,deltaBolo3_6);
+                
+                        compteur++;
+                                
+        #ifdef __MWERKS__ 
+                        DY_yield();
+        #endif
+                        
+                        if((compteur%1000)==0)
+                        {       cout<<"Compteur= "<<compteur<<endl;
+                /*              //      Version Debug a commenter
+                                double pourcent=100.*compteur/NbSAMPLE;
+                                cout<<"Travail effectue a :"<<pourcent<<" %"<<endl;
+                */      }
+                
+                        if(compteur==NbSAMPLE)
+                        {       cout<<" Arret sur option de debugging"<<endl;           //BUGGG
+                                break;
+                        }
                 }
         }
@@ -251 +263 @@
 }
 
+#include "fitstarray.h"
 
 int GenTimLin1_F(long Nbsample, double TStep, float fknee)
@@ -287 +300 @@
         
 // Write my fitFile, Version avec FitsIOServer
-        FitsIoServer FitsServer;
-        sprintf(filecur,"%sTimLineNoisetot%2.2f.fits",PATHResults,fknee);/* name for new FITS file */
-        FitsServer.save(Array,filecur);
-     
+        sprintf(filecur,"%sTimLineNoisetot%2.2f.fits",PATHResults,fknee);/* name for new FITS file */   
+        FITS_TArray <float> FTArray(Array);
+        FTArray.Write(filecur);
+ 
         return 0;
 }