diff options
| -rw-r--r-- | getting_started_with_files/script.rst | 15 | ||||
| -rw-r--r-- | plotting_data/script.rst | 31 |
2 files changed, 38 insertions, 8 deletions
diff --git a/getting_started_with_files/script.rst b/getting_started_with_files/script.rst index bd3dc9b..259be80 100644 --- a/getting_started_with_files/script.rst +++ b/getting_started_with_files/script.rst @@ -1,11 +1,11 @@ .. Objectives .. ---------- -.. By the end of this tutorial, you will be able to -.. 1. Open and read the contents of a file. -.. #. Read files line by line. -.. #. Read all the contents of the file at once. -.. #. Close open files. +.. At the end of this spoken tutorial, you will be able to: +.. 1. Open a file. +.. #. Read the content of the file line by line. +.. #. Read entire contents of the file at once. +.. #. Close the file. .. Prerequisites .. ------------- @@ -58,8 +58,7 @@ or write) in which it is open. Notice that it is open in read only mode, here. We shall first learn to read the whole file into a single -variable. Later, we shall look at reading it line-by-line. We use -the ``read`` method of ``f`` to read, all the contents of the file +variable. We use the ``read`` method of ``f`` to read, all the contents of the file into the variable ``pend``. :: @@ -134,7 +133,7 @@ the file line-wise and print each of the lines. for line in f: print line -As we already know, ``line`` is variable, sometimes called the loop +``line`` is variable, sometimes called the loop variable, and it is not a keyword. We could have used any other variable name, but ``line`` seems meaningful enough. diff --git a/plotting_data/script.rst b/plotting_data/script.rst index 17003bf..1ccec05 100644 --- a/plotting_data/script.rst +++ b/plotting_data/script.rst @@ -30,13 +30,19 @@ Plotting Experimental Data .. L1 +<<<<<<< HEAD {{{ Show the first slide containing title, name of the production team along with the logo of MHRD }}} +======= +Hello and welcome to this tutorial on Plotting Experimental data, +presented by the fossee team. +>>>>>>> 1020097fa446ad8c6bdff784d5d0da9e98a55892 .. R1 Hello Friens.Welcome to this tutorial on "Plotting Experimental data" +<<<<<<< HEAD .. L2 {{{ Show the Objectives Slide }}} @@ -51,6 +57,10 @@ At the end of this tutorial, you will be able to, #. plot errorbars. .. R3 +======= +One needs to be familiar with the concepts of plotting +mathematical functions in Python. +>>>>>>> 1020097fa446ad8c6bdff784d5d0da9e98a55892 We will use data from a Simple Pendulum Experiment to illustrate. @@ -95,14 +105,26 @@ Now to plot L vs T^2, we will simply type .. L6 +<<<<<<< HEAD :: +======= +This clears the plot. + +You can also specify 'o' for big dots.:: + + plot(L,tsquare,'o') +>>>>>>> 1020097fa446ad8c6bdff784d5d0da9e98a55892 plot(L,Tsquare,'.') .. R7 +<<<<<<< HEAD here '.' represents to plot use small dots for the point. You can also specify 'o' for big dots. +======= +Pause video here and solve this exercise. Resume the video once done. +>>>>>>> 1020097fa446ad8c6bdff784d5d0da9e98a55892 .. L7 :: @@ -113,6 +135,7 @@ You can also specify 'o' for big dots. .. L8 +<<<<<<< HEAD .. R8 For any experimental there is always an error in measurements due to @@ -126,6 +149,10 @@ account in our plots . .. R9 Pause the video here, try out the following exercise and resume the video. +======= +.. #[[Anoop: Make sure code is correct, corrected plot(L,t,o) to + plot(L,t,'o')]] +>>>>>>> 1020097fa446ad8c6bdff784d5d0da9e98a55892 Plot the given experimental data with large dots.The data is on your screen. @@ -182,7 +209,11 @@ of errorbar. :: +<<<<<<< HEAD errorbar? +======= +Please, pause the video here. Do the exercises and then continue. +>>>>>>> 1020097fa446ad8c6bdff784d5d0da9e98a55892 .. L15 |